Skip to content

Commit f2b13df

Browse files
committed
Fixed nullptr name issue. Removed redundant .c_str()
Signed-off-by: Jaehyun Kim <[email protected]>
1 parent 9d615f4 commit f2b13df

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

src/odb/src/db/dbBTerm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
623623
name,
624624
net->getId(),
625625
static_cast<void*>(net),
626-
net->_name);
626+
name);
627627
block->_journal->beginAction(dbJournal::CREATE_OBJECT);
628628
block->_journal->pushParam(dbBTermObj);
629629
block->_journal->pushParam(net->getId());

src/odb/src/db/dbInst.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@ dbInst* dbInst::create(dbBlock* block_,
13361336
"ECO: create dbInst({}, {:p}) '{}' master '{}'",
13371337
inst->getId(),
13381338
static_cast<void*>(inst),
1339-
inst->getName(),
1339+
name_,
13401340
master_->getName());
13411341
dbLib* lib = master_->getLib();
13421342
block->_journal->beginAction(dbJournal::CREATE_OBJECT);

src/odb/src/db/dbJournal.cpp

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ void dbJournal::redo_updateBlockField()
986986
block_id,
987987
cornerCount,
988988
extDbCount,
989-
name.c_str());
989+
name);
990990
_block->setCornerCount(cornerCount, extDbCount, name.c_str());
991991
break;
992992
}
@@ -1002,7 +1002,7 @@ void dbJournal::redo_updateBlockField()
10021002
2,
10031003
"REDO ECO: dbBlock {}, writeDb, filename {}, allNode {}",
10041004
block_id,
1005-
name.c_str(),
1005+
name,
10061006
allNode);
10071007
_block->writeDb((char*) name.c_str(), allNode);
10081008
break;
@@ -1138,8 +1138,8 @@ void dbJournal::redo_updateNetField()
11381138
2,
11391139
"REDO ECO: dbNetObj {}, updateName from {} to {}",
11401140
net_id,
1141-
prev_name.c_str(),
1142-
new_name.c_str());
1141+
prev_name,
1142+
new_name);
11431143
((dbNet*) net)->rename(new_name.c_str());
11441144
break;
11451145
}
@@ -1170,8 +1170,8 @@ void dbJournal::redo_updateModNetField()
11701170
2,
11711171
"REDO ECO: dbModNetObj {}, updateName from {} to {}",
11721172
modnet_id,
1173-
prev_name.c_str(),
1174-
new_name.c_str());
1173+
prev_name,
1174+
new_name);
11751175
((dbModNet*) modnet)->rename(new_name.c_str());
11761176
break;
11771177
}
@@ -1249,8 +1249,8 @@ void dbJournal::redo_updateInstField()
12491249
2,
12501250
"REDO ECO: dbInstObj {}, updateName from {} to {}",
12511251
inst_id,
1252-
prev_name.c_str(),
1253-
new_name.c_str());
1252+
prev_name,
1253+
new_name);
12541254
((dbInst*) inst)->rename(new_name.c_str());
12551255
break;
12561256
}
@@ -1877,7 +1877,6 @@ void dbJournal::undo_createObject()
18771877
_log.pop(name);
18781878
_log.pop(mod_net_id);
18791879
_log.pop(parent_id);
1880-
(void) name;
18811880
dbModNet* mod_net = dbModNet::getModNet(_block, mod_net_id);
18821881
debugPrint(_logger,
18831882
utl::ODB,
@@ -1886,7 +1885,7 @@ void dbJournal::undo_createObject()
18861885
"UNDO ECO: create dbModNet({} {:p}) '{}'",
18871886
mod_net_id,
18881887
static_cast<void*>(mod_net),
1889-
mod_net->getName());
1888+
name);
18901889
dbModNet::destroy(mod_net);
18911890
break;
18921891
}
@@ -1898,7 +1897,6 @@ void dbJournal::undo_createObject()
18981897
_log.pop(name);
18991898
_log.pop(modbterm_id);
19001899
_log.pop(parent_id);
1901-
(void) name;
19021900
(void) parent_id;
19031901
dbModBTerm* modbterm = dbModBTerm::getModBTerm(_block, modbterm_id);
19041902

@@ -1909,7 +1907,7 @@ void dbJournal::undo_createObject()
19091907
"UNDO ECO: create dbModBTerm({} {:p}) '{}'",
19101908
modbterm_id,
19111909
static_cast<void*>(modbterm),
1912-
modbterm->getName());
1910+
name);
19131911
dbModBTerm::destroy(modbterm);
19141912
break;
19151913
}
@@ -2064,7 +2062,7 @@ void dbJournal::undo_deleteObject()
20642062
"UNDO ECO: delete dbModule({} {:p}) '{}'",
20652063
module->getId(),
20662064
static_cast<void*>(module),
2067-
name.c_str());
2065+
name);
20682066
break;
20692067
}
20702068

@@ -2094,7 +2092,7 @@ void dbJournal::undo_deleteObject()
20942092
"UNDO ECO: delete dbModInst({} {:p}) '{}'",
20952093
mod_inst->getId(),
20962094
static_cast<void*>(mod_inst),
2097-
name.c_str());
2095+
name);
20982096
break;
20992097
}
21002098

@@ -2115,7 +2113,7 @@ void dbJournal::undo_deleteObject()
21152113
"UNDO ECO: delete dbModNet({} {:p}) '{}'",
21162114
net->getId(),
21172115
static_cast<void*>(net),
2118-
name.c_str());
2116+
name);
21192117
break;
21202118
}
21212119

@@ -2136,7 +2134,7 @@ void dbJournal::undo_deleteObject()
21362134
"UNDO ECO: delete dbModBTerm({} {:p}) '{}'",
21372135
modbterm->getId(),
21382136
static_cast<void*>(modbterm),
2139-
name.c_str());
2137+
name);
21402138
break;
21412139
}
21422140

@@ -2163,7 +2161,7 @@ void dbJournal::undo_deleteObject()
21632161
"UNDO ECO: delete dbModiterm({} {:p}) '{}'",
21642162
mod_iterm->getId(),
21652163
static_cast<void*>(mod_iterm),
2166-
name.c_str());
2164+
name);
21672165
break;
21682166
}
21692167

@@ -2536,7 +2534,7 @@ void dbJournal::undo_updateNetField()
25362534
net_id,
25372535
static_cast<void*>(net),
25382536
new_name,
2539-
prev_name.c_str());
2537+
prev_name);
25402538
((dbNet*) net)->rename(prev_name.c_str());
25412539
break;
25422540
}
@@ -2572,7 +2570,7 @@ void dbJournal::undo_updateModNetField()
25722570
modnet_id,
25732571
static_cast<void*>(modnet),
25742572
new_name,
2575-
prev_name.c_str());
2573+
prev_name);
25762574
((dbModNet*) modnet)->rename(prev_name.c_str());
25772575
break;
25782576
}
@@ -2633,7 +2631,7 @@ void dbJournal::undo_updateInstField()
26332631
inst_id,
26342632
static_cast<void*>(inst),
26352633
new_name,
2636-
prev_name.c_str());
2634+
prev_name);
26372635
((dbInst*) inst)->rename(prev_name.c_str());
26382636
break;
26392637
}

src/odb/src/db/dbNet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ dbNet* dbNet::create(dbBlock* block_, const char* name_, bool skipExistingCheck)
21242124
"ECO: create dbNet({}, {:p}) '{}'",
21252125
net->getId(),
21262126
static_cast<void*>(net),
2127-
net->_name);
2127+
name_);
21282128
block->_journal->beginAction(dbJournal::CREATE_OBJECT);
21292129
block->_journal->pushParam(dbNetObj);
21302130
block->_journal->pushParam(name_);

0 commit comments

Comments
 (0)