Various bugfixes.numsync

5 files changed, 7 insertions, 9 deletions

diff --git a/src/datconv.c b/src/datconv.c
index 737afa9..43a1f33 100644
--- a/src/datconv.c
+++ b/src/datconv.c
@@ -340,9 +340,9 @@ dsconv (struct xdatum *xd, struct dsegm *ds, struct kvpair *kv)
 	{
 	  struct slist *head = slist_new_l (kv->val.s, 1);
 	  struct slist *tail = head;
-	  char *s;
-	  for (s = kv->val.s + 1; *s; s++)
-	    slist_insert (&tail, slist_new_l (s, 1));
+	  char *p;
+	  for (p = kv->val.s + 1; *p; p++)
+	    slist_insert (&tail, slist_new_l (p, 1));
 	  free (kv->val.s);
 	  kv->val.l = head;
 	  kv->type = KV_LIST;
diff --git a/src/gdbmsync.c b/src/gdbmsync.c
index 4e75aa2..9fd7a1d 100644
--- a/src/gdbmsync.c
+++ b/src/gdbmsync.c
@@ -287,7 +287,6 @@ gdbm_numsync_cmp (const char *a, const char *b)
 int
 gdbm_latest_snapshot (const char *even, const char *odd, const char **ret)
 {
-  int r, sum;
   struct stat st_even, st_odd;
 
   if (!ret || !even || !odd || strcmp (even, odd) == 0)
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index 038941a..5d06a39 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -1748,13 +1748,13 @@ struct handler_param param;
 size_t argmax;
 
 void
-param_free_argv (struct handler_param *param, int n)
+param_free_argv (struct handler_param *p, int n)
 {
   int i;
 
   for (i = 0; i < n; i++)
-    gdbmarg_destroy (&param->argv[i]);
-  param->argc = 0;
+    gdbmarg_destroy (&p->argv[i]);
+  p->argc = 0;
 }
 
 typedef struct gdbmarg *(*coerce_type_t) (struct gdbmarg *arg,
diff --git a/src/mem.c b/src/mem.c
index b89de04..bfbeafc 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -20,7 +20,7 @@
 # include "gdbmdefs.h"
 
 void
-ealloc_die ()
+ealloc_die (void)
 {
   error ("%s", strerror (ENOMEM));
   exit (EXIT_FATAL);
diff --git a/tests/gtload.c b/tests/gtload.c
index 7fa6d6b..48d3a43 100644
--- a/tests/gtload.c
+++ b/tests/gtload.c
@@ -25,7 +25,6 @@
 #include "progname.h"
 
 const char *progname;
-int verbose;
 
 void
 err_printer (void *data, char const *fmt, ...)