Bugfixes.

* src/incremen.c (dumpdir_create0): Eliminate gcc warning.
(attach_directory): Bugfix - add missing return statement.
* THANKS: Add Enric Hernandez

diff --git a/ChangeLog b/ChangeLog
index 08d641bb19ad2e4ae5254b84772fec2b5a62c1ce..31a7bbe63ebb66938bcff065c4e0d8cd13423fad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-07  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+       * src/incremen.c (dumpdir_create0): Eliminate gcc warning.
+       (attach_directory): Bugfix - add missing return statement.
+       * THANKS: Add Enric Hernandez
+
 2008-07-31  Sergey Poznyakoff  <gray@gnu.org.ua>
 
        * src/incremen.c (struct directory): New member `next'.  Change

diff --git a/THANKS b/THANKS
index 7538ed35ac3c5ac6058ba8c1cebf4f2ea3a1cbf4..0c2495cdd825076a8dfbbcfeaae6bb44348a62d7 100644 (file)
--- 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 d23e45c7a2787662c16e6bd92f135bf2160d58da..7e1e36641e74b71b74d3d2f879adda761b0c24a9 100644 (file)
--- 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;
 }
                 
 \f