Fix compilation warnings in mh.c

Tag unused paramaters and change name of realpath variable so it won't
shadow the global declaration.

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/mh.c b/mh.c
index d55115d..f108bf9 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -610,7 +610,7 @@ static HEADER *maildir_parse_message (int magic, const char *fname,
 
 static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
                                 const char *subdir, const char *fname,
-                                int *count, int is_old, ino_t inode)
+                                int *count, int is_old, ino_t inode __attribute__ ((unused)))
 {
   struct maildir *entry;
   HEADER *h = NULL;
@@ -887,7 +887,7 @@ static int maildir_read_dir (CONTEXT * ctx)
  * Open a new (temporary) message in an MH folder.
  */
 
-static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr __attribute__ ((unused)))
 {
   return mh_mkstemp (dest, &msg->fp, &msg->path);
 }
@@ -1293,7 +1293,7 @@ static int maildir_sync_message (CONTEXT * ctx, int msgno)
   return (0);
 }
 
-static int mh_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int mh_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), int *index_hint)
 {
   char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
   int i, j;
@@ -1468,7 +1468,7 @@ static void maildir_update_flags (CONTEXT * ctx, HEADER * o, HEADER * n)
  * either subdirectory differently, as mail could be copied directly into
  * the cur directory from another agent.
  */
-static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused)))
 {
   struct stat st_new;           /* status of the "new" subdirectory */
   struct stat st_cur;           /* status of the "cur" subdirectory */
@@ -1605,7 +1605,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
  *
  */
 
-static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused)))
 {
   char buf[_POSIX_PATH_MAX];
   struct stat st, st_cur;
@@ -1788,7 +1788,7 @@ static int maildir_check_empty (const char *path)
   DIR *dp;
   struct dirent *de;
   int r = 1;                    /* assume empty until we find a message */
-  char realpath[_POSIX_PATH_MAX];
+  char frealpath[_POSIX_PATH_MAX];
   int iter = 0;
 
   /* Strategy here is to look for any file not beginning with a period */
@@ -1797,9 +1797,9 @@ static int maildir_check_empty (const char *path)
     /* we do "cur" on the first iteration since its more likely that we'll
      * find old messages without having to scan both subdirs
      */
-    snprintf (realpath, sizeof (realpath), "%s/%s", path,
+    snprintf (frealpath, sizeof (frealpath), "%s/%s", path,
               iter == 0 ? "cur" : "new");
-    if ((dp = opendir (realpath)) == NULL)
+    if ((dp = opendir (frealpath)) == NULL)
       return -1;
     while ((de = readdir (dp))) {
       if (*de->d_name != '.') {