From b791d6802bad5c9403a6bb8aab8536c36ef90213 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 20 Jul 2008 22:41:29 -0700
Subject: [PATCH] Include the array-size in array externs so that IBM's
 code-checker can do more checking for us.

---
 clientserver.c | 2 +-
 exclude.c      | 2 +-
 generator.c    | 2 +-
 hlink.c        | 2 +-
 log.c          | 4 ++--
 main.c         | 2 +-
 receiver.c     | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clientserver.c b/clientserver.c
index 2ba7dbd7..57b0e272 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -56,7 +56,7 @@ extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
 extern struct filter_list_struct daemon_filter_list;
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 extern iconv_t ic_send, ic_recv;
diff --git a/exclude.c b/exclude.c
index 080aa492..9672bf9f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -36,7 +36,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 7735e1e7..58ae82f7 100644
--- a/generator.c
+++ b/generator.c
@@ -74,7 +74,6 @@ extern int fuzzy_basis;
 extern int always_checksum;
 extern int checksum_len;
 extern char *partial_dir;
-extern char *basis_dir[];
 extern int compare_dest;
 extern int copy_dest;
 extern int link_dest;
@@ -94,6 +93,7 @@ extern uid_t our_uid;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
+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;
 
diff --git a/hlink.c b/hlink.c
index ec497096..5c61170e 100644
--- a/hlink.c
+++ b/hlink.c
@@ -35,7 +35,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, *first_flist;
 
 #ifdef SUPPORT_HARD_LINKS
diff --git a/log.c b/log.c
index 58c6bb19..6f9a47ed 100644
--- a/log.c
+++ b/log.c
@@ -55,10 +55,10 @@ extern iconv_t ic_chck;
 #ifdef ICONV_OPTION
 extern iconv_t ic_send, ic_recv;
 #endif
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
 extern char *module_dir;
 extern unsigned int module_dirlen;
-extern char sender_file_sum[];
+extern char sender_file_sum[MAX_DIGEST_LEN];
 
 static int log_initialised;
 static int logfile_was_closed;
diff --git a/main.c b/main.c
index 39eab69b..af14f36c 100644
--- a/main.c
+++ b/main.c
@@ -75,12 +75,12 @@ extern char *logfile_format;
 extern char *filesfrom_host;
 extern char *partial_dir;
 extern char *dest_option;
-extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
 extern char *password_file;
 extern char curr_dir[MAXPATHLEN];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern struct file_list *first_flist;
 extern struct filter_list_struct daemon_filter_list;
 
diff --git a/receiver.c b/receiver.c
index 5beddd64..434957b2 100644
--- a/receiver.c
+++ b/receiver.c
@@ -52,8 +52,8 @@ extern mode_t orig_umask;
 extern struct stats stats;
 extern char *tmpdir;
 extern char *partial_dir;
-extern char *basis_dir[];
-extern char sender_file_sum[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
+extern char sender_file_sum[MAX_DIGEST_LEN];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct filter_list_struct daemon_filter_list;
 
-- 
2.34.1