nad: remove variable definitions shadowed in the global scope

Author: rdmark

bin/nad/nad.h

@@ -78,7 +78,6 @@ typedef struct {
     char p_path[MAXPATHLEN + 2];/* pointer to the start of a path */
 } PATH_T;
 
-extern PATH_T to;
 extern int fflag, iflag, lflag, nflag, pflag, vflag;
 
 #endif /* AD_H */

bin/nad/nad_cp.c

@@ -710,7 +710,7 @@ static int ftw_copy_file(const struct FTW *entp _U_,
     ssize_t wcount;
     size_t wresid;
     off_t wtotal;
-    int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
+    int ch, checkch, from_fd = 0, rcount, to_fd = 0;
     const char *bufp;
     char *p;
 
@@ -946,7 +946,7 @@ static int setfile(const struct stat *fs, int fd)
 {
     static struct timeval tv[2];
     struct stat ts;
-    int rval, gotstat, islink, fdval;
+    int gotstat, islink, fdval;
     mode_t mode;
     rval = 0;
     fdval = fd != -1;

bin/nad/nad_set.c

@@ -91,27 +91,27 @@ static void usage_set(void)
 }
 
 static void change_type(char *path _U_, afpvol_t *vol _U_,
-                        const struct stat *st _U_, struct adouble *ad, char *new_type)
+                        const struct stat *st _U_, struct adouble *ad, char *p_new_type)
 {
     char *FinderInfo;
 
     if ((FinderInfo = ad_entry(ad, ADEID_FINDERI))) {
-        memcpy(FinderInfo, new_type, 4);
+        memcpy(FinderInfo, p_new_type, 4);
     }
 }
 
 static void change_creator(char *path _U_, afpvol_t *vol _U_,
-                           const struct stat *st _U_, struct adouble *ad, char *new_creator)
+                           const struct stat *st _U_, struct adouble *ad, char *p_new_creator)
 {
     char *FinderInfo;
 
     if ((FinderInfo = ad_entry(ad, ADEID_FINDERI))) {
-        memcpy(FinderInfo + 4, new_creator, 4);
+        memcpy(FinderInfo + 4, p_new_creator, 4);
     }
 }
 
 static void change_label(char *path _U_, afpvol_t *vol _U_,
-                         const struct stat *st _U_, struct adouble *ad, char *new_label)
+                         const struct stat *st _U_, struct adouble *ad, char *p_new_label)
 {
     char *FinderInfo;
     const char **color = &labels[0];
@@ -123,7 +123,7 @@ static void change_label(char *path _U_, afpvol_t *vol _U_,
     }
 
     while (*color) {
-        if (strcasecmp(*color, new_label) == 0) {
+        if (strcasecmp(*color, p_new_label) == 0) {
             /* get flags */
             memcpy(&FinderFlags, FinderInfo + 8, 2);
             FinderFlags = ntohs(FinderFlags);
@@ -142,14 +142,14 @@ static void change_label(char *path _U_, afpvol_t *vol _U_,
 }
 
 static void change_attributes(char *path _U_, afpvol_t *vol _U_,
-                              const struct stat *st, struct adouble *ad, char *new_attributes)
+                              const struct stat *st, struct adouble *ad, char *p_new_attributes)
 {
     uint16_t AFPattributes;
     ad_getattr(ad, &AFPattributes);
     AFPattributes = ntohs(AFPattributes);
 
     if (S_ISREG(st->st_mode)) {
-        if (strchr(new_attributes, 'W')) {
+        if (strchr(p_new_attributes, 'W')) {
             AFPattributes |= ATTRBIT_NOWRITE;
         }
 
@@ -203,7 +203,7 @@ static void change_attributes(char *path _U_, afpvol_t *vol _U_,
 }
 
 static void change_flags(char *path _U_, afpvol_t *vol _U_,
-                         const struct stat *st, struct adouble *ad, char *new_flags)
+                         const struct stat *st, struct adouble *ad, char *p_new_flags)
 {
     char *FinderInfo;
     uint16_t FinderFlags;
@@ -216,7 +216,7 @@ static void change_flags(char *path _U_, afpvol_t *vol _U_,
     FinderFlags = ntohs(FinderFlags);
 
     if (S_ISREG(st->st_mode)) {
-        if (strchr(new_flags, 'M')) {
+        if (strchr(p_new_flags, 'M')) {
             FinderFlags |= FINDERINFO_ISHARED;
         }