Fix two unused-variable compiler warnings.

diff --git a/uidlist.c b/uidlist.c
index f5b74817d993a127b80495c1c732d468ab2ca865..3e0fe38a64e94af986e4d6fd910a67d28f023611 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -445,14 +445,13 @@ void parse_name_map(char *map, BOOL usernames)
 {
        struct idlist **idmap_ptr = usernames ? &uidmap : &gidmap;
        struct idlist **idlist_ptr = usernames ? &uidlist : &gidlist;
-       char *colon, *end, *cp = map + strlen(map);
+       char *colon, *cp = map + strlen(map);
        union name_or_id noiu;
        id_t id1;
        uint16 flags;
 
        /* Parse the list in reverse, so the order in the struct is right. */
        while (1) {
-               end = cp;
                while (cp > map && cp[-1] != ',') cp--;
                if (!(colon = strchr(cp, ':'))) {
                        rprintf(FERROR, "No colon found in --%smap: %s\n",

diff --git a/wildtest.c b/wildtest.c
index 07351a1548306a2d17aba189ec315284bc8cb625..88585c2129cccb6c382ec6b9551a216ebcff93f6 100644 (file)
--- a/wildtest.c
+++ b/wildtest.c
@@ -51,15 +51,16 @@ static struct poptOption long_options[] = {
 
 /* match just at the start of string (anchored tests) */
 static void
-run_test(int line, bool matches, bool same_as_fnmatch,
+run_test(int line, bool matches,
+#ifdef COMPARE_WITH_FNMATCH
+        bool same_as_fnmatch,
+#endif
         const char *text, const char *pattern)
 {
     bool matched;
 #ifdef COMPARE_WITH_FNMATCH
     bool fn_matched;
     int flags = strstr(pattern, "**")? 0 : FNM_PATHNAME;
-#else
-    same_as_fnmatch = 0; /* Get rid of unused-variable compiler warning. */
 #endif
 
     if (explode_mod) {
@@ -195,7 +196,11 @@ main(int argc, char **argv)
            while (*++s == ' ' || *s == '\t') {}
        }
        *end[0] = *end[1] = '\0';
-       run_test(line, flag[0], flag[1], string[0], string[1]);
+       run_test(line, flag[0],
+#ifdef COMPARE_WITH_FNMATCH
+                flag[1],
+#endif
+                string[0], string[1]);
     }
 
     if (!wildmatch_errors)