chiark / gitweb /
Merge memory hygeine branch
authorRichard Kettlewell <rjk@greenend.org.uk>
Sun, 18 Jul 2010 16:08:21 +0000 (17:08 +0100)
committerRichard Kettlewell <rjk@greenend.org.uk>
Sun, 18 Jul 2010 16:08:21 +0000 (17:08 +0100)
1  2 
disobedience/login.c
lib/Makefile.am
lib/client.c
lib/configuration.c
lib/configuration.h
lib/queue.h

Simple merge
diff --cc lib/Makefile.am
Simple merge
diff --cc lib/client.c
@@@ -505,9 -515,11 +515,11 @@@ int disorder_close(disorder_client *c) 
      }
      c->fpout = 0;
    }
+   xfree(c->ident);
    c->ident = 0;
+   xfree(c->user);
    c->user = 0;
 -  return 0;
 +  return ret;
  }
  
  /** @brief Play a track
Simple merge
@@@ -326,8 -320,8 +326,10 @@@ char *config_usersysconf(const struct p
  char *config_private(void);
  /* get the private config file */
  
 +int config_verify(void);
 +
+ void config_free(struct config *c);
  extern char *configfile;
  extern int config_per_user;
  
diff --cc lib/queue.h
Simple merge