Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / queue.c

diff --git a/lib/queue.c b/lib/queue.c
index 789d2eaa7120581824ee16ef55ee3c0e6cc59f86..c592f5a13a4e949f516e7106550dcf014720ac70 100644 (file)
--- a/lib/queue.c
+++ b/lib/queue.c
@@ -234,12 +234,12 @@ int queue_unmarshall(struct queue_entry *q, const char *s,
                     void (*error_handler)(const char *, void *),
                     void *u) {
   char **vec;
                     void (*error_handler)(const char *, void *),
                     void *u) {
   char **vec;

-  int nvec;
+  int nvec, rc;

 
   q->pid = -1;                          /* =none */
   if(!(vec = split(s, &nvec, SPLIT_QUOTES, error_handler, u)))
     return -1;
 
   q->pid = -1;                          /* =none */
   if(!(vec = split(s, &nvec, SPLIT_QUOTES, error_handler, u)))
     return -1;

-  int rc = queue_unmarshall_vec(q, nvec, vec, error_handler, u);
+  rc = queue_unmarshall_vec(q, nvec, vec, error_handler, u);

   free_strings(nvec, vec);
   return rc;
 }
   free_strings(nvec, vec);
   return rc;
 }


@@ -291,11 +291,12 @@ char *queue_marshall(const struct queue_entry *q) {
 }
 
 void queue_free(struct queue_entry *q, int rest) {
 }
 
 void queue_free(struct queue_entry *q, int rest) {

+  unsigned n;

   if(!q)
     return;
   if(rest)
     queue_free(q->next, rest);
   if(!q)
     return;
   if(rest)
     queue_free(q->next, rest);

-  for(unsigned n = 0; n < NFIELDS; ++n)
+  for(n = 0; n < NFIELDS; ++n)

     fields[n].free(q, fields[n].offset);
   xfree(q);
 }
     fields[n].free(q, fields[n].offset);
   xfree(q);
 }