Merge various clang-inspired fixes

diff --git a/cgi/actions.c b/cgi/actions.c
index fae533a7b3f45ee37c4ab6e2ed5838ef71c4a0e4..f6755b0317ad2ca080c1d28098e3902df38cb559 100644 (file)
--- a/cgi/actions.c
+++ b/cgi/actions.c
@@ -612,7 +612,7 @@ static int process_prefs(int numfile) {
     byte_xasprintf((char **)&name, "trackname_%s_%s", context, part);
     disorder_set(dcgi_client, file, name, value);
   }
-  if((value = numbered_arg("random", numfile)))
+  if(numbered_arg("random", numfile))
     disorder_unset(dcgi_client, file, "pick_at_random");
   else
     disorder_set(dcgi_client, file, "pick_at_random", "0");

diff --git a/disobedience/choose-search.c b/disobedience/choose-search.c
index acfddfa8d536c6b735d59585472d86748f51a1fb..60df2ec095b9c6d92e8ae2012f7151d320df3323 100644 (file)
--- a/disobedience/choose-search.c
+++ b/disobedience/choose-search.c
@@ -441,6 +441,7 @@ static gboolean choose_get_visible_range(GtkTreeView *tree_view,
  * @param direction -1 for prev, +1 for next
  */
 static void choose_move(int direction) {
+  assert(direction);                    /* placate analyzer */
   /* Refocus the main view so typahead find continues to work */
   gtk_widget_grab_focus(choose_view);
   /* If there's no results we have nothing to do */

diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 4d4194ea76a0e3c5361ed03f2d794ac52920d384..c1a857da2c805827467b97c19dbda44ef1a84df1 100644 (file)
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -601,7 +601,7 @@ static void playlist_new_details(char **namep,
   if(privatep) *privatep = private;
   if(namep) *namep = name;
   if(fullnamep) {
-    if(*sharedp) *fullnamep = *namep;
+    if(shared) *fullnamep = *namep;
     else byte_xasprintf(fullnamep, "%s.%s", config->username, name);
   }
 }

diff --git a/disobedience/rtp.c b/disobedience/rtp.c
index cbedb18aaf8eb4f07b0675f64a6f22df31cf39b9..46931736b42665a205229aafd0289da15d7ef26f 100644 (file)
--- a/disobedience/rtp.c
+++ b/disobedience/rtp.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of Disobedience
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007-2010 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ void start_rtp(void) {
   if(!(pid = xfork())) {
     if(setsid() < 0)
       disorder_fatal(errno, "error calling setsid");
-    if(!(pid = xfork())) {
+    if(!xfork()) {
       /* grandchild */
       exitfn = _exit;
       /* log errors and output somewhere reasonably sane.  rtp_running()

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;
-  int n;
   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);
-  n = 1;
   /* 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;
-  return 0;
+  return ret;
 }
 
 /** @brief Play a track

diff --git a/libtests/t-hash.c b/libtests/t-hash.c
index 4d8b68aaa4afa348367aaef3f397e85bcef7d35d..e23ee1a961879a55445ab3560f52d53f01bd0e40 100644 (file)
--- a/libtests/t-hash.c
+++ b/libtests/t-hash.c
@@ -50,8 +50,10 @@ static void test_hash(void) {
   
   for(i = 0; i < 10000; ++i) {
     insist((ip = hash_find(h, do_printf("%d", i))) != 0);
-    check_integer(*ip, i);
-    insist(hash_add(h, do_printf("%d", i), &i, HASH_REPLACE) == 0);
+    if(ip) {
+      check_integer(*ip, i);
+      insist(hash_add(h, do_printf("%d", i), &i, HASH_REPLACE) == 0);
+    }
   }
   check_integer(hash_count(h), 10000);
   keys = hash_keys(h);

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 *));
-  i = 0;
   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 '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");

diff --git a/server/play.c b/server/play.c
index 99ef4837326d5acf1229b840a381d5a251736f76..8406238d52f8865fe62047725ce05d87ec886d8d 100644 (file)
--- a/server/play.c
+++ b/server/play.c
@@ -300,7 +300,7 @@ static int start(ev_source *ev,
 
   D(("start %s", q->id));
   /* Find the player plugin. */
-  if(!(player = find_player(q)) < 0)
+  if(!(player = find_player(q)))
     return START_HARDFAIL;              /* No player */
   if(!(q->pl = open_plugin(player->s[1], 0)))
     return START_HARDFAIL;
@@ -395,7 +395,7 @@ int prepare(ev_source *ev,
   if(q->prepared || q->preparing)
     return START_OK;
   /* Find the player plugin */
-  if(!(player = find_player(q)) < 0) 
+  if(!(player = find_player(q))) 
     return START_HARDFAIL;              /* No player */
   q->pl = open_plugin(player->s[1], 0);
   q->type = play_get_type(q->pl);

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) {
-  const char *action, *id = u;
+  const char *id = u;
   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)

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) {
-  int max, n;
+  int max;
   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");
-  n = 0;
   while(*tracks) {
     sink_printf(ev_writer_sink(c->w), "%s%s\n",
                **tracks == '.' ? "." : "", *tracks);

diff --git a/server/speaker.c b/server/speaker.c
index a2c2e7c7650a8b45a7f5de5b0a406d5a360e1fca..3af36aaac22289ab6616f0a63282f2c6ffe091a5 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -340,7 +340,8 @@ static int speaker_fill(struct track *t) {
         t->playable = 1;
       rc = 0;
     }
-  }
+  } else
+    rc = 0;
   return rc;
 }