The branch, master has been updated
via fd91c3b Fix two unused-variable compiler warnings.
from 15df927 Fix xattr memory leak. Fixes bug 8475.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fd91c3b6661dbd7453a143cad81ca08cd34b243b
Author: Wayne Davison <way...@samba.org>
Date: Thu Sep 22 23:37:07 2011 -0700
Fix two unused-variable compiler warnings.
-----------------------------------------------------------------------
Summary of changes:
uidlist.c | 3 +--
wildtest.c | 13 +++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/uidlist.c b/uidlist.c
index f5b7481..3e0fe38 100644
--- 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 07351a1..88585c2 100644
--- 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)
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
