diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2008-07-02 08:01:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2008-07-02 08:01:00 -0700 |
| commit | 303baf27cf34c2a57db97c4c567fd744241fa14b (patch) | |
| tree | d6235cca48e7bdfe5884e517058c7791e66bb806 /src/misc/nm | |
| parent | fa67e3c19e27c011517b91182eb3929412aaf402 (diff) | |
| download | abc-303baf27cf34c2a57db97c4c567fd744241fa14b.tar.gz abc-303baf27cf34c2a57db97c4c567fd744241fa14b.tar.bz2 abc-303baf27cf34c2a57db97c4c567fd744241fa14b.zip | |
Version abc80702
Diffstat (limited to 'src/misc/nm')
| -rw-r--r-- | src/misc/nm/nmApi.c | 8 | ||||
| -rw-r--r-- | src/misc/nm/nmTable.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/misc/nm/nmApi.c b/src/misc/nm/nmApi.c index 9165922f..576882a7 100644 --- a/src/misc/nm/nmApi.c +++ b/src/misc/nm/nmApi.c @@ -111,7 +111,7 @@ char * Nm_ManStoreIdName( Nm_Man_t * p, int ObjId, int Type, char * pName, char Nm_Entry_t * pEntry; int RetValue, nEntrySize; // check if the object with this ID is already stored - if ( pEntry = Nm_ManTableLookupId(p, ObjId) ) + if ( (pEntry = Nm_ManTableLookupId(p, ObjId)) ) { printf( "Nm_ManStoreIdName(): Entry with the same ID already exists.\n" ); return NULL; @@ -173,7 +173,7 @@ char * Nm_ManCreateUniqueName( Nm_Man_t * p, int ObjId ) static char NameStr[1000]; Nm_Entry_t * pEntry; int i; - if ( pEntry = Nm_ManTableLookupId(p, ObjId) ) + if ( (pEntry = Nm_ManTableLookupId(p, ObjId)) ) return pEntry->Name; sprintf( NameStr, "n%d", ObjId ); for ( i = 1; Nm_ManTableLookupName(p, NameStr, -1); i++ ) @@ -195,7 +195,7 @@ char * Nm_ManCreateUniqueName( Nm_Man_t * p, int ObjId ) char * Nm_ManFindNameById( Nm_Man_t * p, int ObjId ) { Nm_Entry_t * pEntry; - if ( pEntry = Nm_ManTableLookupId(p, ObjId) ) + if ( (pEntry = Nm_ManTableLookupId(p, ObjId)) ) return pEntry->Name; return NULL; } @@ -215,7 +215,7 @@ char * Nm_ManFindNameById( Nm_Man_t * p, int ObjId ) int Nm_ManFindIdByName( Nm_Man_t * p, char * pName, int Type ) { Nm_Entry_t * pEntry; - if ( pEntry = Nm_ManTableLookupName(p, pName, Type) ) + if ( (pEntry = Nm_ManTableLookupName(p, pName, Type)) ) return pEntry->ObjId; return -1; } diff --git a/src/misc/nm/nmTable.c b/src/misc/nm/nmTable.c index f97a2f0b..e50388ba 100644 --- a/src/misc/nm/nmTable.c +++ b/src/misc/nm/nmTable.c @@ -77,7 +77,7 @@ int Nm_ManTableAdd( Nm_Man_t * p, Nm_Entry_t * pEntry ) pEntry->pNextI2N = *ppSpot; *ppSpot = pEntry; // check if an entry with the same name already exists - if ( pOther = Nm_ManTableLookupName(p, pEntry->Name, -1) ) + if ( (pOther = Nm_ManTableLookupName(p, pEntry->Name, -1)) ) { // entry with the same name already exists - add it to the ring pEntry->pNameSake = pOther->pNameSake? pOther->pNameSake : pOther; @@ -188,7 +188,6 @@ Nm_Entry_t * Nm_ManTableLookupId( Nm_Man_t * p, int ObjId ) Nm_Entry_t * Nm_ManTableLookupName( Nm_Man_t * p, char * pName, int Type ) { Nm_Entry_t * pEntry, * pTemp; - int Counter = 0; for ( pEntry = p->pBinsN2I[ Nm_HashString(pName, p->nBins) ]; pEntry; pEntry = pEntry->pNextN2I ) { // check the entry itself |