From: Wayne Davison Date: Mon, 30 Oct 2006 20:17:02 +0000 (+0000) Subject: Got rid of superfluous externs. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/78b1089b6e48ffd18fe2d21c42a86fc4e23ed5c2 Got rid of superfluous externs. --- diff --git a/acls.diff b/acls.diff index ef54696..4d385fd 100644 --- a/acls.diff +++ b/acls.diff @@ -30,7 +30,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ --- old/acls.c +++ new/acls.c -@@ -0,0 +1,1099 @@ +@@ -0,0 +1,1098 @@ +/* + * Handle passing Access Control Lists between systems. + * @@ -58,7 +58,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. + +#ifdef SUPPORT_ACLS + -+extern int am_root; +extern int dry_run; +extern int read_only; +extern int list_only; @@ -5722,7 +5721,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. extern int preserve_perms; extern int preserve_executability; extern int preserve_times; -@@ -100,7 +101,8 @@ void free_sums(struct sum_struct *s) +@@ -47,7 +48,6 @@ extern int preserve_gid; + extern int inplace; + extern int keep_dirlinks; + extern int make_backups; +-extern mode_t orig_umask; + extern struct stats stats; + extern struct chmod_mode_struct *daemon_chmod_modes; + +@@ -100,7 +100,8 @@ void free_sums(struct sum_struct *s) /* This is only called when we aren't preserving permissions. Figure out what * the permissions should be and return them merged back into the mode. */ @@ -5732,7 +5739,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. { int new_mode; /* If the file already exists, we'll return the local permissions, -@@ -117,56 +119,65 @@ mode_t dest_mode(mode_t flist_mode, mode +@@ -117,56 +118,65 @@ mode_t dest_mode(mode_t flist_mode, mode new_mode |= (new_mode & 0444) >> 2; } } else { @@ -5813,7 +5820,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. ; else #endif -@@ -176,45 +187,57 @@ int set_file_attrs(char *fname, struct f +@@ -176,45 +186,57 @@ int set_file_attrs(char *fname, struct f rprintf(FINFO, "set uid of %s from %ld to %ld\n", fname, @@ -5881,7 +5888,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync. } if (ret == 0) /* ret == 1 if symlink could not be set */ updated = 1; -@@ -227,6 +250,11 @@ int set_file_attrs(char *fname, struct f +@@ -227,6 +249,11 @@ int set_file_attrs(char *fname, struct f else rprintf(FCLIENT, "%s is uptodate\n", fname); }