More ctidy clean ups -- overrides, memory. Signed-off-by: Andy Fox an…

…[email protected] Signed-off-by: andyfox-rushc <[email protected]>
andyfox-rushc · Jul 21, 2024 · 918b5a3 · 918b5a3
1 parent 40d975c
commit 918b5a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/src/dbSta/include/db_sta/dbNetwork.hh b/src/dbSta/include/db_sta/dbNetwork.hh
@@ -96,7 +96,7 @@ class dbNetwork : public ConcreteNetwork
   void init(dbDatabase* db, Logger* logger);
   void setBlock(dbBlock* block);
   void clear() override;
-  CellPortIterator* portIterator(const Cell* cell) const;
+  CellPortIterator* portIterator(const Cell* cell) const override;
 
   void readLefAfter(dbLib* lib);
   void readDefAfter(dbBlock* block);
@@ -119,7 +119,7 @@ class dbNetwork : public ConcreteNetwork
   bool isPlaced(const Pin* pin) const;
 
   LibertyCell* libertyCell(dbInst* inst);
-  LibertyPort* libertyPort(const Pin*) const;
+  LibertyPort* libertyPort(const Pin*) const override;
   dbInst* staToDb(const Instance* instance) const;
   void staToDb(const Instance* instance,
                dbInst*& db_inst,
@@ -229,7 +229,7 @@ class dbNetwork : public ConcreteNetwork
 
   ////////////////////////////////////////////////////////////////
   // Cell functions
-  const char* name(const Cell* instance) const override;
+  const char* name(const Cell* cell) const override;
 
   bool isConcreteCell(const Cell*) const;
   void registerConcreteCell(const Cell*);

diff --git a/src/dbSta/src/dbNetwork.cc b/src/dbSta/src/dbNetwork.cc
@@ -635,13 +635,13 @@ const char* dbNetwork::name(const Port* port) const
     dbBTerm* bterm = nullptr;
     staToDb(port, bterm, mterm, modbterm);
     if (bterm) {
-      return bterm->getName().c_str();
+      return tmpStringCopy(bterm->getName().c_str());
     }
     if (mterm) {
-      return mterm->getName().c_str();
+      return tmpStringCopy(mterm->getName().c_str());
     }
     if (modbterm) {
-      return modbterm->getName();
+      return tmpStringCopy(modbterm->getName());
     }
   }
   return nullptr;
@@ -652,19 +652,18 @@ const char* dbNetwork::busName(const Port* port) const
   if (isConcretePort(port)) {
     const ConcretePort* cport = reinterpret_cast<const ConcretePort*>(port);
     return cport->busName();
-  } else {
-    dbMTerm* mterm = nullptr;
-    dbModBTerm* modbterm = nullptr;
-    dbBTerm* bterm = nullptr;
-    staToDb(port, bterm, mterm, modbterm);
-    if (modbterm) {
-      if (modbterm->isBusPort()) {
-        return modbterm->getBusPort()->getName();
-      }
+  }
+  dbMTerm* mterm = nullptr;
+  dbModBTerm* modbterm = nullptr;
+  dbBTerm* bterm = nullptr;
+  staToDb(port, bterm, mterm, modbterm);
+  if (modbterm) {
+    if (modbterm->isBusPort()) {
+      return modbterm->getBusPort()->getName();
     }
-    logger_->error(ORD, 2020, "Error: database badly formed bus name");
-    return nullptr;
   }
+  logger_->error(ORD, 2020, "Error: database badly formed bus name");
+  return nullptr;
 }
 
 const char* dbNetwork::name(const Instance* instance) const
@@ -704,7 +703,7 @@ class dbModulePortIterator : public CellPortIterator
 {
  public:
   explicit dbModulePortIterator(const dbModule* cell);
-  ~dbModulePortIterator();
+  ~dbModulePortIterator() override;
   virtual bool hasNext();
   virtual Port* next();