Fix a few of the things the Clang static analyzer detects:

 - some unused variables
 - disorder-dump -r was broken

diff --git a/lib/cgi.c b/lib/cgi.c
index 15b556c483cbc51915c179ee1b72e6e23ccafc4c..9fd42f1d41a929625be9dde37817f55285fbcf0f 100644 (file)
--- a/lib/cgi.c
+++ b/lib/cgi.c
@@ -226,7 +226,6 @@ void cgi_clear(void) {
  */
 char *cgi_sgmlquote(const char *src) {
   uint32_t *ucs, c;
  */
 char *cgi_sgmlquote(const char *src) {
   uint32_t *ucs, c;

-  int n;

   struct dynstr d[1];
   struct sink *s;
 
   struct dynstr d[1];
   struct sink *s;
 


@@ -234,7 +233,6 @@ char *cgi_sgmlquote(const char *src) {
     exit(1);
   dynstr_init(d);
   s = sink_dynstr(d);
     exit(1);
   dynstr_init(d);
   s = sink_dynstr(d);

-  n = 1;

   /* format the string */
   while((c = *ucs++)) {
     switch(c) {
   /* format the string */
   while((c = *ucs++)) {
     switch(c) {

diff --git a/lib/client.c b/lib/client.c
index 67f8a530f156d6ac0da7d821f48551b164c97c45..00727ef010e78f62e3e6adbc0f771b2da9ba1f17 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -507,7 +507,7 @@ int disorder_close(disorder_client *c) {
   }
   c->ident = 0;
   c->user = 0;
   }
   c->ident = 0;
   c->user = 0;

-  return 0;
+  return ret;

 }
 
 /** @brief Play a track
 }
 
 /** @brief Play a track

diff --git a/plugins/exec.c b/plugins/exec.c
index f6ed8b37d4c8b1eeb6e75658a74b19bc67121826..e2e712c9b4f32eb171c8fe97d3f77f642839ea78 100644 (file)
--- a/plugins/exec.c
+++ b/plugins/exec.c
@@ -39,7 +39,6 @@ void disorder_play_track(const char *const *parameters,
   const char **vec;
 
   vec = disorder_malloc((nparameters + 2) * sizeof (char *));
   const char **vec;
 
   vec = disorder_malloc((nparameters + 2) * sizeof (char *));

-  i = 0;

   j = 0;
   for(i = 0; i < nparameters; ++i)
     vec[j++] = parameters[i];
   j = 0;
   for(i = 0; i < nparameters; ++i)
     vec[j++] = parameters[i];

diff --git a/server/dump.c b/server/dump.c
index cdc3a44fc72a57e70eb1f60d823afda31a9e209e..fb0741503808e261ad532481ba32c08a23564017 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -378,8 +378,8 @@ int main(int argc, char **argv) {
     case 'd': dump = 1; break;
     case 'u': undump = 1; break;
     case 'D': debugging = 1; break;
     case 'd': dump = 1; break;
     case 'u': undump = 1; break;
     case 'D': debugging = 1; break;

-    case 'r': recover = TRACKDB_NORMAL_RECOVER;
-    case 'R': recover = TRACKDB_FATAL_RECOVER;
+    case 'r': recover = TRACKDB_NORMAL_RECOVER; break;
+    case 'R': recover = TRACKDB_FATAL_RECOVER; break;

     case 'a': recompute = 1; break;
     case 'P': remove_pathless = 1; break;
     default: disorder_fatal(0, "invalid option");
     case 'a': recompute = 1; break;
     case 'P': remove_pathless = 1; break;
     default: disorder_fatal(0, "invalid option");

diff --git a/server/schedule.c b/server/schedule.c
index f1b20a123d96433188d70bef0286f60fcf8406c5..c7b4eede3be0691d5b444cc57453bbbf06873b57 100644 (file)
--- a/server/schedule.c
+++ b/server/schedule.c
@@ -471,14 +471,12 @@ static int schedule_lookup(const char *id,
 static int schedule_trigger(ev_source *ev,
                            const struct timeval attribute((unused)) *now,
                            void *u) {
 static int schedule_trigger(ev_source *ev,
                            const struct timeval attribute((unused)) *now,
                            void *u) {

-  const char *action, *id = u;
+  const char *id = u;

   struct kvp *actiondata = schedule_get(id);
   int n;
 
   if(!actiondata)
     return 0;
   struct kvp *actiondata = schedule_get(id);
   int n;
 
   if(!actiondata)
     return 0;

-  /* schedule_get() enforces these being present */
-  action = kvp_get(actiondata, "action");

   /* Look up the action */
   n = schedule_lookup(id, actiondata);
   if(n < 0)
   /* Look up the action */
   n = schedule_lookup(id, actiondata);
   if(n < 0)

diff --git a/server/server.c b/server/server.c
index 858edbc9d2da531516903aa3a77bd2ac08170cd5..4dafabbbcf380ac5756ba5c23ddf687a398c96f9 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -1177,7 +1177,7 @@ static int c_nop(struct conn *c,
 static int c_new(struct conn *c,
                 char **vec,
                 int nvec) {
 static int c_new(struct conn *c,
                 char **vec,
                 int nvec) {

-  int max, n;
+  int max;

   char **tracks;
 
   if(nvec > 0)
   char **tracks;
 
   if(nvec > 0)


@@ -1188,7 +1188,6 @@ static int c_new(struct conn *c,
     max = config->new_max;
   tracks = trackdb_new(0, max);
   sink_printf(ev_writer_sink(c->w), "253 New track list follows\n");
     max = config->new_max;
   tracks = trackdb_new(0, max);
   sink_printf(ev_writer_sink(c->w), "253 New track list follows\n");

-  n = 0;

   while(*tracks) {
     sink_printf(ev_writer_sink(c->w), "%s%s\n",
                **tracks == '.' ? "." : "", *tracks);
   while(*tracks) {
     sink_printf(ev_writer_sink(c->w), "%s%s\n",
                **tracks == '.' ? "." : "", *tracks);