summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2019-03-04 14:29:57 -0800
committerAlan Mishchenko <alanmi@berkeley.edu>2019-03-04 14:29:57 -0800
commitbc288a76332b1684b0183084aee0a4f46c617b62 (patch)
treedd8054d1408836d7e1bdc51eb6b2af2fb351eb70 /src
parent9842e82326b8e0a6605460888ae56757cb9a9a0f (diff)
downloadabc-bc288a76332b1684b0183084aee0a4f46c617b62.tar.gz
abc-bc288a76332b1684b0183084aee0a4f46c617b62.tar.bz2
abc-bc288a76332b1684b0183084aee0a4f46c617b62.zip
Suggested white-space changes for fewer gcc warnings.
Diffstat (limited to 'src')
-rw-r--r--src/aig/ivy/ivyCheck.c2
-rw-r--r--src/base/io/ioWriteBlif.c2
-rw-r--r--src/bool/kit/kitTruth.c2
-rw-r--r--src/bool/lucky/lucky.c4
-rw-r--r--src/misc/bar/bar.h4
-rw-r--r--src/opt/ret/retDelay.c10
-rw-r--r--src/opt/sfm/sfmSat.c2
-rw-r--r--src/opt/sim/simSupp.c10
-rw-r--r--src/proof/fraig/fraigSat.c8
-rw-r--r--src/sat/glucose/Options.cpp2
10 files changed, 24 insertions, 22 deletions
diff --git a/src/aig/ivy/ivyCheck.c b/src/aig/ivy/ivyCheck.c
index c924e2d0..d8ebb198 100644
--- a/src/aig/ivy/ivyCheck.c
+++ b/src/aig/ivy/ivyCheck.c
@@ -97,7 +97,7 @@ int Ivy_ManCheck( Ivy_Man_t * p )
pObj2 = Ivy_TableLookup( p, pObj );
if ( pObj2 != pObj )
printf( "Ivy_ManCheck: Latch with ID \"%d\" is not in the structural hashing table.\n", pObj->Id );
- continue;
+ continue;
}
// consider the AND node
if ( !Ivy_ObjFanin0(pObj) || !Ivy_ObjFanin1(pObj) )
diff --git a/src/base/io/ioWriteBlif.c b/src/base/io/ioWriteBlif.c
index e77b3bce..818f66b3 100644
--- a/src/base/io/ioWriteBlif.c
+++ b/src/base/io/ioWriteBlif.c
@@ -948,7 +948,7 @@ void Io_NtkWriteNodeInt( FILE * pFile, Abc_Obj_t * pNode, Vec_Int_t * vCover )
fprintf( pFile, " %s_cascade", Abc_ObjName(Abc_ObjFanout0(pNode)) );
else
fprintf( pFile, " %s", Abc_ObjName(Abc_ObjFanin(pNode,pVars[c][i])) );
- fprintf( pFile, " %s%s\n", Abc_ObjName(Abc_ObjFanout0(pNode)), c? "" : "_cascade" );
+ fprintf( pFile, " %s%s\n", Abc_ObjName(Abc_ObjFanout0(pNode)), c? "" : "_cascade" );
// write SOP
pSop = Io_NtkDeriveSop( (Mem_Flex_t *)Abc_ObjNtk(pNode)->pManFunc,
diff --git a/src/bool/kit/kitTruth.c b/src/bool/kit/kitTruth.c
index 87b28135..dbf013fe 100644
--- a/src/bool/kit/kitTruth.c
+++ b/src/bool/kit/kitTruth.c
@@ -639,7 +639,7 @@ int Kit_TruthVarIsVacuous( unsigned * pOnset, unsigned * pOffset, int nVars, int
for ( i = 0; i < nWords; i++ )
if ( ((pOnset[i] & (pOffset[i] >> 2)) | (pOffset[i] & (pOnset[i] >> 2))) & 0x33333333 )
return 0;
- return 1;
+ return 1;
case 2:
for ( i = 0; i < nWords; i++ )
if ( ((pOnset[i] & (pOffset[i] >> 4)) | (pOffset[i] & (pOnset[i] >> 4))) & 0x0F0F0F0F )
diff --git a/src/bool/lucky/lucky.c b/src/bool/lucky/lucky.c
index 49eec996..7db08b9a 100644
--- a/src/bool/lucky/lucky.c
+++ b/src/bool/lucky/lucky.c
@@ -56,7 +56,7 @@ int memCompare(word* x, word* y, int nVars)
tempWord = a[i];
count++;
}
- p->nFuncs = count;
+ p->nFuncs = count;
}
//////////sort Word** a//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int compareWords2 (const void ** x, const void ** y)
@@ -94,7 +94,7 @@ void sortAndUnique(word** a, Abc_TtStore_t* p)
tempWordPtr = a[i];
count++;
}
- p->nFuncs = count;
+ p->nFuncs = count;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/misc/bar/bar.h b/src/misc/bar/bar.h
index c66e302e..15cb2912 100644
--- a/src/misc/bar/bar.h
+++ b/src/misc/bar/bar.h
@@ -61,7 +61,9 @@ extern void Bar_ProgressStop( Bar_Progress_t * p );
extern void Bar_ProgressUpdate_int( Bar_Progress_t * p, int nItemsCur, char * pString );
static inline void Bar_ProgressUpdate( Bar_Progress_t * p, int nItemsCur, char * pString ) {
- if ( BAR_PROGRESS_USE && p && (nItemsCur < *((int*)p)) ) return; Bar_ProgressUpdate_int(p, nItemsCur, pString); }
+ if ( BAR_PROGRESS_USE && p && (nItemsCur < *((int*)p)) ) return;
+ Bar_ProgressUpdate_int(p, nItemsCur, pString);
+}
diff --git a/src/opt/ret/retDelay.c b/src/opt/ret/retDelay.c
index 0263c92f..92680cd0 100644
--- a/src/opt/ret/retDelay.c
+++ b/src/opt/ret/retDelay.c
@@ -96,8 +96,8 @@ int Abc_NtkRetimeMinDelayTry( Abc_Ntk_t * pNtk, int nDelayLim, int fForward, int
}
}
-if ( fVerbose && !fInitial )
- printf( "Performing analysis:\n" );
+ if ( fVerbose && !fInitial )
+ printf( "Performing analysis:\n" );
// find the best iteration
DelayBest = ABC_INFINITY; IterBest = 0; LatchesBest = Abc_NtkLatchNum(pNtk);
vCritical = Vec_PtrAlloc( 100 );
@@ -150,9 +150,9 @@ if ( fVerbose && !fInitial )
Vec_IntFree( vValues );
}
}
-if ( fVerbose && !fInitial )
- printf( "%s : Starting delay = %3d. Final delay = %3d. IterBest = %2d (out of %2d).\n",
- fForward? "Forward " : "Backward", DelayStart, DelayBest, IterBest, nIterLimit );
+ if ( fVerbose && !fInitial )
+ printf( "%s : Starting delay = %3d. Final delay = %3d. IterBest = %2d (out of %2d).\n",
+ fForward? "Forward " : "Backward", DelayStart, DelayBest, IterBest, nIterLimit );
*pIterBest = (nIterLimit == 1) ? 1 : IterBest;
return DelayBest;
}
diff --git a/src/opt/sfm/sfmSat.c b/src/opt/sfm/sfmSat.c
index 0d5bbca2..8bcb7f8a 100644
--- a/src/opt/sfm/sfmSat.c
+++ b/src/opt/sfm/sfmSat.c
@@ -260,7 +260,7 @@ void Sfm_ComputeInterpolantCheck( Sfm_Ntk_t * p )
else if ( uTruth == SFM_SAT_UNDEC )
printf( "The problem is UNDEC.\n" );
else
- Kit_DsdPrintFromTruth( (unsigned *)&uTruth, 2 ); printf( "\n" );
+ Kit_DsdPrintFromTruth( (unsigned *)&uTruth, 2 ), printf( "\n" );
}
}
diff --git a/src/opt/sim/simSupp.c b/src/opt/sim/simSupp.c
index 5def7dae..a87ac0f1 100644
--- a/src/opt/sim/simSupp.c
+++ b/src/opt/sim/simSupp.c
@@ -118,8 +118,8 @@ Vec_Ptr_t * Sim_ComputeFunSupp( Abc_Ntk_t * pNtk, int fVerbose )
// set the support targets
Sim_ComputeSuppSetTargets( p );
-if ( fVerbose )
- printf( "Number of support targets after simulation = %5d.\n", Vec_VecSizeSize(p->vSuppTargs) );
+ if ( fVerbose )
+ printf( "Number of support targets after simulation = %5d.\n", Vec_VecSizeSize(p->vSuppTargs) );
if ( Vec_VecSizeSize(p->vSuppTargs) == 0 )
goto exit;
@@ -131,9 +131,9 @@ if ( fVerbose )
if ( Vec_VecSizeSize(p->vSuppTargs) == 0 )
goto exit;
-if ( fVerbose )
- printf( "Targets = %5d. Solved = %5d. Fifo = %5d.\n",
- Vec_VecSizeSize(p->vSuppTargs), nSolved, Vec_PtrSize(p->vFifo) );
+ if ( fVerbose )
+ printf( "Targets = %5d. Solved = %5d. Fifo = %5d.\n",
+ Vec_VecSizeSize(p->vSuppTargs), nSolved, Vec_PtrSize(p->vFifo) );
}
// try to solve the support targets
diff --git a/src/proof/fraig/fraigSat.c b/src/proof/fraig/fraigSat.c
index 3c1b2a1b..7cad3eab 100644
--- a/src/proof/fraig/fraigSat.c
+++ b/src/proof/fraig/fraigSat.c
@@ -358,8 +358,8 @@ p->timeTrav += Abc_Clock() - clk;
// printf( "The number of MUXes detected = %d (%5.2f %% of logic). ", nMuxes, 300.0*nMuxes/(p->vNodes->nSize - p->vInputs->nSize) );
// ABC_PRT( "Time", Abc_Clock() - clk );
-if ( fVerbose )
- printf( "%d(%d) - ", Fraig_CountPis(p,p->vVarsInt), Msat_IntVecReadSize(p->vVarsInt) );
+ if ( fVerbose )
+ printf( "%d(%d) - ", Fraig_CountPis(p,p->vVarsInt), Msat_IntVecReadSize(p->vVarsInt) );
// prepare variable activity
@@ -574,8 +574,8 @@ clk = Abc_Clock();
// Fraig_PrepareCones( p, pOld, pNew );
p->timeTrav += Abc_Clock() - clk;
-if ( fVerbose )
- printf( "%d(%d) - ", Fraig_CountPis(p,p->vVarsInt), Msat_IntVecReadSize(p->vVarsInt) );
+ if ( fVerbose )
+ printf( "%d(%d) - ", Fraig_CountPis(p,p->vVarsInt), Msat_IntVecReadSize(p->vVarsInt) );
// get the complemented attribute
diff --git a/src/sat/glucose/Options.cpp b/src/sat/glucose/Options.cpp
index a310809e..d0a4793f 100644
--- a/src/sat/glucose/Options.cpp
+++ b/src/sat/glucose/Options.cpp
@@ -65,7 +65,7 @@ void Gluco::printUsageAndExit (int argc, char** argv, bool verbose)
if (usage != NULL)
fprintf(stderr, usage, argv[0]);
- sort(Option::getOptionList(), Option::OptionLt());
+ sort(Option::getOptionList(), Option::OptionLt());
const char* prev_cat = NULL;
const char* prev_type = NULL;