Placate static analyzer

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);
   }
     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");
     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) {
  * @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 */
   /* 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/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
 /*
  * 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
  *
  * 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(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()
       /* grandchild */
       exitfn = _exit;
       /* log errors and output somewhere reasonably sane.  rtp_running()

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);
   
   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);
   }
   check_integer(hash_count(h), 10000);
   keys = hash_keys(h);

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;
     }
         t->playable = 1;
       rc = 0;
     }

-  }
+  } else
+    rc = 0;

   return rc;
 }
 
   return rc;
 }