diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 13:42:31 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 13:42:31 +0000 |
| commit | cf594ad7c0bffc5047da21a65802b7e20bfb9371 (patch) | |
| tree | 1dc0c1cef6510fed7295f24ac2f58f1aae89611c /cpukit/libfs/src/nfsclient/src/rpcio.c | |
| parent | Improved parameter checks for bit rate function. (diff) | |
| download | rtems-cf594ad7c0bffc5047da21a65802b7e20bfb9371.tar.bz2 | |
2008-09-05 Eric Norum <norume@aps.anl.gov>
* libfs/src/nfsclient/src/rpcio.c: Correct breakage introduced by Joel
removing asserts with side-effects.
Diffstat (limited to 'cpukit/libfs/src/nfsclient/src/rpcio.c')
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/rpcio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c index 020ebf99af..5003b4ed00 100644 --- a/cpukit/libfs/src/nfsclient/src/rpcio.c +++ b/cpukit/libfs/src/nfsclient/src/rpcio.c @@ -409,7 +409,7 @@ static inline void *MY_MALLOC(int s) MU_LOCK(hlock); assert(nibufs++ < 2000); MU_UNLOCK(hlock); - assert(rval = malloc(s)); + assert((rval = malloc(s)) != 0); return rval; } return 0; @@ -422,7 +422,7 @@ static inline void *MY_CALLOC(int n, int s) MU_LOCK(hlock); assert(nibufs++ < 2000); MU_UNLOCK(hlock); - assert(rval = calloc(n,s)); + assert((rval = calloc(n,s)) != 0); return rval; } return 0; @@ -960,7 +960,7 @@ struct sockwakeup wkup; /* fprintf saves/restores FP registers on PPC :-( */ RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT, &rpciod); - assert( status = RTEMS_SUCCESSFUL ); + assert( status == RTEMS_SUCCESSFUL ); wkup.sw_pfn = rxWakeupCB; wkup.sw_arg = (caddr_t)rpciod; @@ -971,9 +971,9 @@ struct sockwakeup wkup; sizeof(RpcUdpXact), RTEMS_DEFAULT_ATTRIBUTES, &msgQ); - assert( status = RTEMS_SUCCESSFUL ); + assert( status == RTEMS_SUCCESSFUL ); status = rtems_task_start( rpciod, rpcio_daemon, 0 ); - assert( status = RTEMS_SUCCESSFUL ); + assert( status == RTEMS_SUCCESSFUL ); } else { return -1; |