From 85c79094976b446c310cee4450a573a633359f26 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sun, 7 Sep 2008 08:49:10 +0000 Subject: [PATCH] Bugfixes. * src/incremen.c (dumpdir_create0): Eliminate gcc warning. (attach_directory): Bugfix - add missing return statement. * THANKS: Add Enric Hernandez --- ChangeLog | 6 ++++++ THANKS | 1 + src/incremen.c | 10 ++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08d641b..31a7bbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-07 Sergey Poznyakoff + + * src/incremen.c (dumpdir_create0): Eliminate gcc warning. + (attach_directory): Bugfix - add missing return statement. + * THANKS: Add Enric Hernandez + 2008-07-31 Sergey Poznyakoff * src/incremen.c (struct directory): New member `next'. Change diff --git a/THANKS b/THANKS index 7538ed3..0c2495c 100644 --- a/THANKS +++ b/THANKS @@ -152,6 +152,7 @@ Eduardo V. de Rivas eddie@asterion.com Edward Welbourne eddy@gen.cam.ac.uk Elmar Heeb heeb@itp.ethz.ch Elmer Fittery elmerf@ptw.com +Enric Hernandez ehernandez@notariado.org Eric Backus ericb@lsid.hp.com Eric Benson eb@amazon.com Eric Blake ebb9@byu.net diff --git a/src/incremen.c b/src/incremen.c index d23e45c..7e1e366 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -81,13 +81,14 @@ dumpdir_create0 (const char *contents, const char *cmask) { struct dumpdir *dump; size_t i, total, ctsize, len; - const char *p; + char *p; + const char *q; - for (i = 0, total = 0, ctsize = 1, p = contents; *p; total++, p += len) + for (i = 0, total = 0, ctsize = 1, q = contents; *q; total++, q += len) { - len = strlen (p) + 1; + len = strlen (q) + 1; ctsize += len; - if (!cmask || strchr (cmask, *p)) + if (!cmask || strchr (cmask, *q)) i++; } dump = xmalloc (sizeof (*dump) + ctsize); @@ -279,6 +280,7 @@ attach_directory (const char *name) else dirhead = dir; dirtail = dir; + return dir; } -- 2.44.0