Skip to content

Commit e5f471b

Browse files
committed
fix readability-redundant-control-flow
Signed-off-by: Matt Liberty <[email protected]>
1 parent 446cd68 commit e5f471b

File tree

15 files changed

+1
-36
lines changed

15 files changed

+1
-36
lines changed

src/odb/src/def/def/defiBlockage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ void defiBlockage::setPlacement()
151151
{
152152
/* 10/29/2001 - Wanda da Rosa, new enhancement */
153153
hasPlacement_ = 1;
154-
return;
155154
}
156155

157156
void defiBlockage::setComponent(const char* name)

src/odb/src/def/def/defiMisc.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ void defiGeometries::points(int index, int* x, int* y) const
130130
}
131131
*x = x_[index];
132132
*y = y_[index];
133-
return;
134133
}
135134

136135
////////////////////////////////////////////////////

src/odb/src/def/def/defiNet.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,6 @@ void defiNet::changeInstance(const char* instance, int index)
13491349
}
13501350
instances_[index] = (char*) malloc(len);
13511351
strcpy(instances_[index], defData->DEFCASE(instance));
1352-
return;
13531352
}
13541353

13551354
void defiNet::changePin(const char* pin, int index)
@@ -1366,7 +1365,6 @@ void defiNet::changePin(const char* pin, int index)
13661365
}
13671366
pins_[index] = (char*) malloc(len);
13681367
strcpy(pins_[index], defData->DEFCASE(pin));
1369-
return;
13701368
}
13711369

13721370
const char* defiNet::name() const

src/odb/src/def/def/defiPinCap.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,6 @@ void defiPin::addAntennaModel(int oxide)
16101610
}
16111611
amo->Init();
16121612
amo->setAntennaModel(oxide);
1613-
return;
16141613
}
16151614

16161615
// 5.5

src/odb/src/def/def/defrReader.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,6 @@ void defrDisableParserMsgs(int nMsg, int* msgs)
19721972
}
19731973
}
19741974
}
1975-
return;
19761975
}
19771976

19781977
void defrEnableParserMsgs(int nMsg, int* msgs)
@@ -2011,7 +2010,6 @@ void defrEnableParserMsgs(int nMsg, int* msgs)
20112010
defContext.settings->disableDMsgs[j] = 0; // set to 0
20122011
}
20132012
defContext.settings->nDDMsgs = i;
2014-
return;
20152013
}
20162014

20172015
void defrEnableAllMsgs()
@@ -2037,7 +2035,6 @@ void defrSetLimitPerMsg(int msgId, int numMsg)
20372035
return;
20382036
}
20392037
defContext.settings->MsgLimit[msgId - 5000] = numMsg;
2040-
return;
20412038
}
20422039

20432040
// *****************************************************************

src/odb/src/def/def/defwWriter.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7381,21 +7381,18 @@ void defwPrintError(int status)
73817381
defwStateStr[defwObsoleteNum]);
73827382
break;
73837383
}
7384-
return;
73857384
}
73867385

73877386
void defwAddComment(const char* comment)
73887387
{
73897388
if (comment) {
73907389
fprintf(defwFile, "# %s\n", comment);
73917390
}
7392-
return;
73937391
}
73947392

73957393
void defwAddIndent()
73967394
{
73977395
fprintf(defwFile, " ");
7398-
return;
73997396
}
74007397

74017398
//***************************

src/odb/src/def/defrw/defrw.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,6 @@ void* reallocCB(void* name, size_t size)
33123312
void freeCB(void* name)
33133313
{
33143314
free(name);
3315-
return;
33163315
}
33173316

33183317
BEGIN_DEF_PARSER_NAMESPACE

src/odb/src/lef/lef/lefiLayer.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4156,8 +4156,6 @@ void lefiLayer::addAntennaModel(int aOxide)
41564156
amo->setAntennaModel(aOxide);
41574157

41584158
currentAntennaModel_ = amo;
4159-
4160-
return;
41614159
}
41624160

41634161
// 5.5
@@ -5657,7 +5655,6 @@ void lefiLayer::parseSpacing(int index)
56575655

56585656
// None of the above statement
56595657
free(wrkingStr);
5660-
return;
56615658
}
56625659

56635660
// PRIVATE 5.7
@@ -5876,7 +5873,6 @@ void lefiLayer::parseArraySpacing(int index)
58765873
}
58775874

58785875
free(wrkingStr);
5879-
return;
58805876
}
58815877

58825878
// PRIVATE 5.7
@@ -6097,7 +6093,6 @@ void lefiLayer::parseMinstep(int index)
60976093
addMinstepXSameCorners();
60986094
}
60996095
free(wrkingStr);
6100-
return;
61016096
}
61026097

61036098
// PRIVATE 5.7
@@ -6133,7 +6128,6 @@ void lefiLayer::parseAntennaCumRouting(int index)
61336128
}
61346129

61356130
free(wrkingStr);
6136-
return;
61376131
}
61386132

61396133
// PRIVATE 5.7
@@ -6173,7 +6167,6 @@ void lefiLayer::parseAntennaGatePlus(int index)
61736167
}
61746168

61756169
free(wrkingStr);
6176-
return;
61776170
}
61786171

61796172
// PRIVATE 5.7
@@ -6213,7 +6206,6 @@ void lefiLayer::parseAntennaAreaMinus(int index)
62136206
}
62146207

62156208
free(wrkingStr);
6216-
return;
62176209
}
62186210

62196211
// PRIVATE 5.7
@@ -6291,7 +6283,6 @@ void lefiLayer::parseAntennaAreaDiff(int index)
62916283
}
62926284

62936285
free(wrkingStr);
6294-
return;
62956286
}
62966287

62976288
// PRIVATE 5.7
@@ -6507,7 +6498,6 @@ void lefiLayer::parseLayerEnclosure(int index)
65076498
}
65086499

65096500
free(wrkingStr);
6510-
return;
65116501
}
65126502

65136503
// 5.7

src/odb/src/lef/lef/lefiMacro.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@ void lefiPinAntennaModel::addAntennaMaxCutCar(double val, const char* layer)
566566
void lefiPinAntennaModel::setAntennaReturnFlag(int flag)
567567
{
568568
hasReturn_ = flag;
569-
return;
570569
}
571570

572571
int lefiPinAntennaModel::hasAntennaGateArea() const
@@ -1964,8 +1963,6 @@ void lefiPin::addAntennaModel(int oxide)
19641963

19651964
amo->Init();
19661965
amo->setAntennaModel(oxide);
1967-
1968-
return;
19691966
}
19701967

19711968
// 5.5

src/odb/src/lef/lef/lefiViaRule.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ void lefiViaRuleLayer::setOverhangToEnclosure(double d)
140140
} else {
141141
overhang2_ = d; // overhang1_ already set, set to overhang2_
142142
}
143-
return;
144143
}
145144

146145
// 5.5

0 commit comments

Comments
 (0)