The branch, b3.0.x has been updated
via d702b97 Mention the latest changes.
via 53a46d9 Fix two unused-variable compiler warnings.
from 510c5ab Fix xattr memory leak. Fixes bug 8475.
;a=shortlog;h=b3.0.x
- Log -----------------------------------------------------------------
commit d702b978380aa1f6abf7f7bfc1e7fad4011a2660
Author: Wayne Davison <way...@samba.org>
Date: Thu Sep 22 23:33:51 2011 -0700
Mention the latest changes.
commit 53a46d9e09fff01aac6978d0d5f70dc550dfe1a4
Author: Wayne Davison <way...@samba.org>
Date: Thu Sep 22 23:31:18 2011 -0700
Fix two unused-variable compiler warnings.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 +++++
io.c | 2 --
wildtest.c | 13 +++++++++----
3 files changed, 14 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 980754e..53b7aca 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ Changes since 3.0.8:
- Fix preservation of a symlink's system xattrs (e.g. selinux) on Linux.
+ - Fix a memory leak in the xattr code.
+
+ - Fixed a bug with --delete-excluded when a filter merge file has a rule
+ that specifies a receiver-only side restriction.
+
- Fix a bug with the modifying of unwritable directories.
- Fix --fake-super's interaction with --link-dest same-file comparisons.
diff --git a/io.c b/io.c
index b6db8e9..b8e52bf 100644
--- a/io.c
+++ b/io.c
@@ -1066,7 +1066,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t
len)
xbuf outbuf, inbuf;
char ibuf[512];
int add_null = 0;
- int pos = 0;
INIT_CONST_XBUF(outbuf, line);
INIT_XBUF(inbuf, ibuf, 0, -1);
@@ -1081,7 +1080,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t
len)
if (iconvbufs(ic_send, &inbuf, &outbuf,
ICB_INCLUDE_BAD |
ICB_INCLUDE_INCOMPLETE) < 0)
goto overflow;
- pos = -1;
}
if (add_null) {
if (outbuf.len == outbuf.size)
diff --git a/wildtest.c b/wildtest.c
index bd1f4cc..7691b6c 100644
--- a/wildtest.c
+++ b/wildtest.c
@@ -50,15 +50,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) {
@@ -194,7 +195,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
