Fix various dead stores found by the clang static analyzer.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index d5a355566e387df5bc6e8b1ec06fad03bb660c3e..62dedbf24a73cd65747c53df51f62ff6129c6363 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -741,7 +741,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size,
 #define GET_NUM_DIGITS(x, num) { \
        typeof((x)) _tmp = PARA_ABS(x); \
        *num = 1; \
-       if ((x)) \
+       if ((_tmp)) \
                while ((_tmp) > 9) { \
                        (_tmp) /= 10; \
                        (*num)++; \
@@ -1008,6 +1008,13 @@ out:
        return ret;
 }
 
+/**
+ * Write a list of audio-file related status items with empty values.
+ *
+ * \param buf Result pointer.
+ *
+ * This is used by vss when currently no audio file is open.
+ */
 void make_empty_status_items(char *buf)
 {
        sprintf(buf,
@@ -1301,7 +1308,6 @@ static void com_ls_callback(int fd, const struct osl_object *query)
                        prepare_ls_row);
        if (ret < 0)
                goto out;
-       ret = opts->num_patterns? -E_NO_MATCH : 0;
        if (!opts->num_matching_paths)
                goto out;
        ret = sort_matching_paths(opts);
@@ -1716,7 +1722,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
        afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 out:
        if (ret < 0)
-               ret = para_printf(&msg, "%s\n", para_strerror(-ret));
+               para_printf(&msg, "%s\n", para_strerror(-ret));
        if (msg.offset)
                pass_buffer_as_shm(msg.buf, msg.offset, &fd);
        free(msg.buf);
@@ -2131,7 +2137,7 @@ static int remove_audio_file(__a_unused struct osl_table *table,
                struct osl_row *row, const char *name, void *data)
 {
        struct com_rm_action_data *crd = data;
-       int ret, ret2;
+       int ret;
 
        if (crd->flags & RM_FLAG_VERBOSE) {
                ret = para_printf(&crd->pb, "removing %s\n", name);
@@ -2141,8 +2147,7 @@ static int remove_audio_file(__a_unused struct osl_table *table,
        afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
        ret = osl_del_row(audio_file_table, row);
        if (ret < 0)
-               ret2 = para_printf(&crd->pb, "%s: %s\n", name,
-                       para_strerror(-ret));
+               para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret));
        else
                crd->num_removed++;
        return ret;
@@ -2171,7 +2176,7 @@ static void com_rm_callback(int fd, const struct osl_object *query)
                pmd.fnmatch_flags |= FNM_PATHNAME;
        ret = for_each_matching_row(&pmd);
        if (ret < 0) {
-               ret = para_printf(&crd.pb, "%s\n", para_strerror(-ret));
+               para_printf(&crd.pb, "%s\n", para_strerror(-ret));
                return;
        }
        if (!crd.num_removed && !(crd.flags & RM_FLAG_FORCE))
@@ -2321,14 +2326,13 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
        ret = for_each_matching_row(&pmd);
 out:
        if (ret < 0)
-               ret = para_printf(&cad.pb, "%s\n", para_strerror(-ret));
+               para_printf(&cad.pb, "%s\n", para_strerror(-ret));
        else if (cad.flags & CPSI_FLAG_VERBOSE) {
                if (cad.num_copied)
-                       ret = para_printf(&cad.pb, "copied requested afsi from %s "
-                               "to %u files\n",
-                               source_path, cad.num_copied);
+                       para_printf(&cad.pb, "copied requested afsi from %s "
+                               "to %u files\n", source_path, cad.num_copied);
                else
-                       ret = para_printf(&cad.pb, "nothing copied\n");
+                       para_printf(&cad.pb, "nothing copied\n");
        }
        if (cad.pb.offset)
                pass_buffer_as_shm(cad.pb.buf, cad.pb.offset, &fd);