Fix various dead stores found by the clang static analyzer.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 2d40c235df8cf51fab7c2134e6bce1499769c9bf..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.
  */
@@ -20,6 +20,7 @@
 #include "vss.h"
 #include "fd.h"
 #include "ipc.h"
+#include "portable_io.h"
 
 static struct osl_table *audio_file_table;
 
@@ -588,8 +589,6 @@ int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 static int save_afd(struct audio_file_data *afd)
 {
        size_t size = sizeof(*afd) + sizeof_chunk_table(&afd->afhi);
-
-       PARA_DEBUG_LOG("size: %zu\n", size);
        int shmid, ret = shm_new(size);
        void *shm_afd;
        char *buf;
@@ -742,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)++; \
@@ -1009,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,
@@ -1261,8 +1267,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
        GET_NUM_DIGITS(d->afsi.num_played, &num_digits);
        w->num_played_width = PARA_MAX(w->num_played_width, num_digits);
        /* get the number of chars to print this amount of time */
-       tmp = get_duration_width(d->afhi.seconds_total);
-       w->duration_width = PARA_MAX(w->duration_width, tmp);
+       num_digits = get_duration_width(d->afhi.seconds_total);
+       w->duration_width = PARA_MAX(w->duration_width, num_digits);
        GET_NUM_DIGITS(d->afsi.amp, &num_digits);
        w->amp_width = PARA_MAX(w->amp_width, num_digits);
        if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) {
@@ -1302,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);
@@ -1599,6 +1604,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
        struct afs_info default_afsi = {.last_played = 0};
        struct para_buffer msg = {.max_size = SHMMAX,
                .max_size_handler = pass_buffer_as_shm, .private_data = &fd};
+       uint16_t afhi_offset, chunks_offset;
 
        hash = (HASH_TYPE *)buf + CAB_HASH_OFFSET;
        hash_to_asc(hash, asc);;
@@ -1653,8 +1659,8 @@ static void com_add_callback(int fd, const struct osl_object *query)
                        goto out;
        }
        /* no hs or force mode, child must have sent afhi */
-       uint16_t afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS);
-       uint16_t chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS);
+       afhi_offset = read_u16(buf + CAB_AFHI_OFFSET_POS);
+       chunks_offset = read_u16(buf + CAB_CHUNKS_OFFSET_POS);
 
        objs[AFTCOL_AFHI].data = buf + afhi_offset;
        objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset;
@@ -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))
@@ -2304,10 +2309,6 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
        };
        int ret;
        char *source_path = (char *)query->data + sizeof(cad.flags);
-
-       ret = get_afsi_of_path(source_path, &cad.source_afsi);
-       if (ret < 0)
-               goto out;
        struct pattern_match_data pmd = {
                .table = audio_file_table,
                .loop_col_num = AFTCOL_HASH,
@@ -2318,17 +2319,20 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
                .data = &cad,
                .action = copy_selector_info
        };
+
+       ret = get_afsi_of_path(source_path, &cad.source_afsi);
+       if (ret < 0)
+               goto out;
        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);