nad: don't store variables that are never accessed

Author: rdmark

bin/nad/nad_ls.c

@@ -526,7 +526,6 @@ static int ad_print(char *path, const struct stat *st, afpvol_t *vol)
 static int ad_ls_r(char *path, afpvol_t *vol)
 {
     int ret = 0, cwd, dirprinted = 0, dirempty;
-    const char *name;
     char *tmp;
     static char cwdpath[MAXPATHLEN + 1];
     DIR *dp;
@@ -584,7 +583,7 @@ static int ad_ls_r(char *path, afpvol_t *vol)
         }
 
         /* Check for netatalk special folders e.g. ".AppleDB" or ".AppleDesktop" */
-        if ((name = check_netatalk_dirs(ep->d_name)) != NULL) {
+        if (check_netatalk_dirs(ep->d_name) != NULL) {
             continue;
         }
 
@@ -631,7 +630,7 @@ static int ad_ls_r(char *path, afpvol_t *vol)
             }
 
             /* Check for netatalk special folders e.g. ".AppleDB" or ".AppleDesktop" */
-            if ((name = check_netatalk_dirs(ep->d_name)) != NULL) {
+            if (check_netatalk_dirs(ep->d_name) != NULL) {
                 continue;
             }
 

bin/nad/nad_mv.c

@@ -189,7 +189,7 @@ int ad_mv(int argc, char *argv[], AFPObj *obj)
             return 1;
         }
 
-        rval = do_move(argv[0], argv[1]);
+        do_move(argv[0], argv[1]);
         closevol(&svolume);
         closevol(&dvolume);
         return 1;
@@ -351,7 +351,6 @@ static int do_move(const char *from, const char *to)
             close(srcfd);
 
             if (errno == EXDEV) {
-                mustcopy = 1;
                 char path[MAXPATHLEN];
 
                 /*

bin/nad/nad_util.c

@@ -181,10 +181,10 @@ char *utompath(const struct vol *vol, const char *upath)
     }
 
     /* convert charsets */
-    if ((size_t) -1 == (outlen = convert_charset(vol->v_volcharset,
-                                 CH_UTF8_MAC,
-                                 vol->v_maccharset,
-                                 u, outlen, mpath, MAXPATHLEN, &flags))) {
+    if ((size_t) -1 == convert_charset(vol->v_volcharset,
+                                       CH_UTF8_MAC,
+                                       vol->v_maccharset,
+                                       u, outlen, mpath, MAXPATHLEN, &flags)) {
         SLOG("Conversion from %s to %s for %s failed.",
              vol->v_volcodepage, vol->v_maccodepage, u);
         return NULL;