From: Wayne Davison <wayned@samba.org>
Date: Wed, 30 Jun 2010 15:58:40 +0000 (-0700)
Subject: Fixed inconsistencies reported by packaging/var-checker.
X-Git-Tag: v3.0.8pre1~70
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=55dbbdeafea0b7af0b96d789368942af9edd9743;p=rsync.git

Fixed inconsistencies reported by packaging/var-checker.
---

diff --git a/checksum.c b/checksum.c
index 4aaeb954..90d6ee3a 100644
--- a/checksum.c
+++ b/checksum.c
@@ -24,8 +24,6 @@
 extern int checksum_seed;
 extern int protocol_version;
 
-int csum_length = SHORT_SUM_LENGTH; /* initial value */
-
 /*
   a simple 32 bit checksum that can be upadted from either end
   (inspired by Mark Adler's Adler-32 checksum)
diff --git a/exclude.c b/exclude.c
index 70fa8c8a..e6490b09 100644
--- a/exclude.c
+++ b/exclude.c
@@ -37,7 +37,7 @@ extern int sanitize_paths;
 extern int protocol_version;
 extern int module_id;
 
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
 extern unsigned int curr_dir_len;
 extern unsigned int module_dirlen;
 
diff --git a/generator.c b/generator.c
index 11854cc4..f1fdcddd 100644
--- a/generator.c
+++ b/generator.c
@@ -76,7 +76,7 @@ extern int fuzzy_basis;
 extern int always_checksum;
 extern int checksum_len;
 extern char *partial_dir;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern int compare_dest;
 extern int copy_dest;
 extern int link_dest;
diff --git a/hlink.c b/hlink.c
index cfa1065e..fb090a9f 100644
--- a/hlink.c
+++ b/hlink.c
@@ -37,7 +37,7 @@ extern int remove_source_files;
 extern int stdout_format_has_i;
 extern int maybe_ATTRS_REPORT;
 extern int unsort_ndx;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern struct file_list *cur_flist;
 
 #ifdef SUPPORT_HARD_LINKS
diff --git a/io.c b/io.c
index 6599e5a9..00410003 100644
--- a/io.c
+++ b/io.c
@@ -36,7 +36,6 @@
 extern int bwlimit;
 extern size_t bwlimit_writemax;
 extern int io_timeout;
-extern int allowed_lull;
 extern int am_server;
 extern int am_daemon;
 extern int am_sender;
@@ -47,7 +46,6 @@ extern int eol_nulls;
 extern int flist_eof;
 extern int list_only;
 extern int read_batch;
-extern int csum_length;
 extern int compat_flags;
 extern int protect_args;
 extern int checksum_seed;
@@ -61,7 +59,8 @@ extern int filesfrom_convert;
 extern iconv_t ic_send, ic_recv;
 #endif
 
-const char phase_unknown[] = "unknown";
+int csum_length = SHORT_SUM_LENGTH; /* initial value */
+int allowed_lull = 0;
 int ignore_timeout = 0;
 int batch_fd = -1;
 int msgdone_cnt = 0;
diff --git a/log.c b/log.c
index 05de68a2..02ac4ea1 100644
--- a/log.c
+++ b/log.c
@@ -52,9 +52,9 @@ extern char *logfile_name;
 extern iconv_t ic_chck;
 #endif
 #ifdef ICONV_OPTION
-extern iconv_t ic_send, ic_recv;
+extern iconv_t ic_recv;
 #endif
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
 extern char *full_module_path;
 extern unsigned int module_dirlen;
 
diff --git a/main.c b/main.c
index f0ad96a0..af9ae078 100644
--- a/main.c
+++ b/main.c
@@ -70,7 +70,7 @@ extern struct stats stats;
 extern char *filesfrom_host;
 extern char *partial_dir;
 extern char *dest_option;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
diff --git a/options.c b/options.c
index 2daaa677..00b96645 100644
--- a/options.c
+++ b/options.c
@@ -85,7 +85,6 @@ int numeric_ids = 0;
 int allow_8bit_chars = 0;
 int force_delete = 0;
 int io_timeout = 0;
-int allowed_lull = 0;
 int prune_empty_dirs = 0;
 int use_qsort = 0;
 char *files_from = NULL;
diff --git a/receiver.c b/receiver.c
index 39c5e490..ea11ed53 100644
--- a/receiver.c
+++ b/receiver.c
@@ -53,7 +53,7 @@ extern mode_t orig_umask;
 extern struct stats stats;
 extern char *tmpdir;
 extern char *partial_dir;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct filter_list_struct daemon_filter_list;