Changed flist_extra_ndx into flist_extra_cnt.

batch.c

@@ -36,7 +36,7 @@ extern int always_checksum;
 extern int do_compression;
 extern int def_compress_level;
 extern int protocol_version;
-extern int flist_extra_ndx;
+extern int flist_extra_cnt;
 extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
@@ -120,12 +120,12 @@ void read_stream_flags(int fd)
 
 	if (tweaked_preserve_uid) {
 		if (!preserve_uid)
-			preserve_uid = flist_extra_ndx++;
+			preserve_uid = ++flist_extra_cnt;
 	} else
 		preserve_uid = 0;
 	if (tweaked_preserve_gid) {
 		if (!preserve_gid)
-			preserve_gid = flist_extra_ndx++;
+			preserve_gid = ++flist_extra_cnt;
 	} else
 		preserve_gid = 0;
 	if (tweaked_compress_level == 0 || tweaked_compress_level == 2)

options.c

@@ -116,7 +116,7 @@ int checksum_seed = 0;
 int inplace = 0;
 int delay_updates = 0;
 long block_size = 0; /* "long" because popt can't set an int32. */
-int flist_extra_ndx = 1; /* index of optional file-list items */
+int flist_extra_cnt = 0; /* count of file-list extras that everyone gets */
 
 /** Network address family. **/
 #ifdef INET6
@@ -1220,9 +1220,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	}
 
 	if (preserve_uid)
-		preserve_uid = flist_extra_ndx++;
+		preserve_uid = ++flist_extra_cnt;
 	if (preserve_gid)
-		preserve_gid = flist_extra_ndx++;
+		preserve_gid = ++flist_extra_cnt;
 
 	*argv = poptGetArgs(pc);
 	*argc = count_args(*argv);