Merge branch 't/clang'

diff --git a/NEWS b/NEWS
index 57ef197ba3e9dbba332ec208c43d90f48cfd5040..c6c2e4dbd741954bd344d5b240e7ba98851ff7e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@
          writers is now treated as a regular expression. This allows
          to replace 5 lines in the config file (one for each audio
          format) by one single line. See the manual for details.
+       - Compiles cleanly also with llvm/clang.
 
 --------------------------------------
 0.4.7 (2011-06-01) "infinite rollback"

diff --git a/fecdec_filter.c b/fecdec_filter.c
index fb2dba025d37806b2b70bd8f8002cae09e3e4db8..09a2fabd7bb418d7e94f8bea2cac4fb5d9826bfa 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -291,7 +291,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
        size_t written, need;
        struct private_fecdec_data *pfd = fn->private_data;
        enum fec_group_usability u = group_is_usable(fg, pfd);
-       char *buf = NULL, *p;
+       char *buf = NULL;
 
        if (u == FEC_GROUP_UNUSABLE) {
                PARA_INFO_LOG("dropping unusable group %d\n", fg->h.group_num);
@@ -315,7 +315,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
        if (need > btr_pool_unused(pfd->btrp))
                return -E_FECDEC_OVERRUN;
        btr_pool_get_buffer(pfd->btrp, &buf);
-       p = buf;
        if (u == FEC_GROUP_USABLE_WITH_HEADER) {
                PARA_INFO_LOG("writing audio file header\n");
                written = 0;
@@ -328,7 +327,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
                        btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
                        written += n;
                }
-               p += written;
        }
        written = 0;
        for (; i < fg->h.data_slices_per_group; i++) {
@@ -338,7 +336,6 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn)
                btr_copy(fg->data[i], n, pfd->btrp, fn->btrn);
                written += n;
        }
-       p += written;
        return 0;
 }