more 'if ((A = B()) == C)' to 'if (C== (A = B())) changes

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 8464aad3b49abed72a595e2c49b97d4154639d49..44d40daf1143c9cc4c4acb9ff21d53f18ebe4beb 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.56 2003-01-12 14:39:58 didg Exp $
+ * $Id: directory.c,v 1.57 2003-01-21 09:58:58 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1283,7 +1283,7 @@ int               ibuflen, *rbuflen;
     memcpy( &did, ibuf, sizeof( did ));
     ibuf += sizeof( int );
 
-    if (( dir = dirlookup( vol, did )) == NULL ) {
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
         return afp_errno;
     }
 
@@ -1291,7 +1291,7 @@ int               ibuflen, *rbuflen;
     bitmap = ntohs( bitmap );
     ibuf += sizeof( bitmap );
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (NULL == ( path = cname( vol, dir, &ibuf )) ) {
         return afp_errno;
     }
 
@@ -1306,7 +1306,7 @@ int               ibuflen, *rbuflen;
         ibuf++;
     }
 
-    if (( rc = setdirparams(vol, path, bitmap, ibuf )) == AFP_OK ) {
+    if (AFP_OK == ( rc = setdirparams(vol, path, bitmap, ibuf )) ) {
         setvoltime(obj, vol );
     }
     return( rc );

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 6d9382eaec1b863f9e35581f496155b5a35906c7..434b37d72b73e59d051824289c5701cbc7624931 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.74 2003-01-16 21:18:15 didg Exp $
+ * $Id: file.c,v 1.75 2003-01-21 09:58:58 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -654,7 +654,7 @@ int         ibuflen, *rbuflen;
 
     memcpy(&did, ibuf, sizeof( did ));
     ibuf += sizeof( did );
-    if (( dir = dirlookup( vol, did )) == NULL ) {
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
         return( AFPERR_NOOBJ );
     }
 
@@ -662,7 +662,7 @@ int         ibuflen, *rbuflen;
     bitmap = ntohs( bitmap );
     ibuf += sizeof( bitmap );
 
-    if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
         return afp_errno;
     }
 
@@ -674,7 +674,7 @@ int         ibuflen, *rbuflen;
         ibuf++;
     }
 
-    if (( rc = setfilparams(vol, s_path, bitmap, ibuf )) == AFP_OK ) {
+    if (AFP_OK == ( rc = setfilparams(vol, s_path, bitmap, ibuf )) ) {
         setvoltime(obj, vol );
     }
 
@@ -1526,7 +1526,7 @@ int               ibuflen, *rbuflen;
     memcpy(&did, ibuf, sizeof( did ));
     ibuf += sizeof(did);
 
-    if (( dir = dirlookup( vol, did )) == NULL ) {
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
         return( AFPERR_PARAM );
     }
 
@@ -1617,14 +1617,14 @@ int             ibuflen, *rbuflen;
     memcpy(&vid, ibuf, sizeof(vid));
     ibuf += sizeof(vid);
 
-    if (( vol = getvolbyvid( vid )) == NULL ) {
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
         return( AFPERR_PARAM);
     }
 
     memcpy(&id, ibuf, sizeof( id ));
     ibuf += sizeof(id);
 
-    if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) {
+    if (NULL == (upath = cnid_resolve(vol->v_db, &id, buffer, len)) ) {
         return AFPERR_NOID; /* was AFPERR_BADID, but help older Macs */
     }
 
@@ -1691,7 +1691,7 @@ int               ibuflen, *rbuflen;
     memcpy(&vid, ibuf, sizeof(vid));
     ibuf += sizeof(vid);
 
-    if (( vol = getvolbyvid( vid )) == NULL ) {
+    if (NULL == ( vol = getvolbyvid( vid )) ) {
         return( AFPERR_PARAM);
     }
 
@@ -1702,7 +1702,7 @@ int               ibuflen, *rbuflen;
     ibuf += sizeof(id);
     fileid = id;
 
-    if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) {
+    if (NULL == (upath = cnid_resolve(vol->v_db, &id, buffer, len)) ) {
         return AFPERR_NOID;
     }
 
@@ -1800,11 +1800,11 @@ int             ibuflen, *rbuflen;
     ibuf += sizeof(did);
 
     /* source file */
-    if ((dir = dirlookup( vol, sid )) == NULL ) {
+    if (NULL == (dir = dirlookup( vol, sid )) ) {
         return( AFPERR_PARAM );
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (NULL == ( path = cname( vol, dir, &ibuf )) ) {
         return( AFPERR_PARAM );
     }
 
@@ -1846,11 +1846,11 @@ int             ibuflen, *rbuflen;
                       slen = strlen(supath));
 #endif /* CNID_DB */
 
-    if (( dir = dirlookup( vol, did )) == NULL ) {
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
         return( AFPERR_PARAM );
     }
 
-    if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (NULL == ( path = cname( vol, dir, &ibuf )) ) {
         return( AFPERR_PARAM );
     }
 

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 6ea49b2ba66605f27063fa1614f32da888cfb57e..8b4177cf4573e1c97e97f9b6cd7c6f3c2fbdd5c5 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.38 2003-01-12 14:40:01 didg Exp $
+ * $Id: filedir.c,v 1.39 2003-01-21 09:58:58 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -558,7 +558,7 @@ int         ibuflen, *rbuflen;
        return afp_errno;    
     }
 
-    if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+    if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
         return afp_errno;
     }
 
@@ -668,7 +668,7 @@ int         ibuflen, *rbuflen;
     ibuf += sizeof( int );
 
     /* source pathname */
-    if (( path = cname( vol, sdir, &ibuf )) == NULL ) {
+    if (NULL == ( path = cname( vol, sdir, &ibuf )) ) {
         return( AFPERR_NOOBJ );
     }
 
@@ -684,7 +684,7 @@ int         ibuflen, *rbuflen;
     }
 
     /* get the destination directory */
-    if (( ddir = dirlookup( vol, did )) == NULL ) {
+    if (NULL == ( ddir = dirlookup( vol, did )) ) {
         return( AFPERR_PARAM );
     }
     if (( path = cname( vol, ddir, &ibuf )) == NULL ) {