Fix -Wdeclaration-after-statement warnings.

[paraslash.git] / afh.c

diff --git a/afh.c b/afh.c
index dd69d9e458d73ff9fbd9735f590b54a3b999922f..c82d17fd19acc5c1484d883b4021a59d4718c599 100644 (file)
--- a/afh.c
+++ b/afh.c
@@ -60,7 +60,7 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
        int ret;
        struct timeval stream_start;
        long unsigned i, first_chunk, last_chunk;
-       char *buf;
+       const char *buf;
        size_t size;
 
 
@@ -112,6 +112,8 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
                                        return ret;
                        }
                }
+               if (!size)
+                       continue;
                PARA_INFO_LOG("writing chunk %lu\n", i);
                ret = write_all(STDOUT_FILENO, buf, &size);
                if (ret < 0)
@@ -120,9 +122,17 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
        return 1;
 }
 
+/**
+ * The main function of para_afh.
+ *
+ * \param argc Usual argument count.
+ * \param argv Usual argument vector.
+ *
+ * \return \p EXIT_FAILURE or \p EXIT_SUCCESS.
+ */
 int main(int argc, char **argv)
 {
-       int ret, audio_format_num;
+       int ret, audio_format_num, fd;
        void *audio_file_data;
        size_t audio_file_size;
        struct afh_info afhi;
@@ -134,10 +144,11 @@ int main(int argc, char **argv)
                goto out;
        afh_init();
        ret = mmap_full_file(conf.inputs[0], O_RDONLY, &audio_file_data,
-               &audio_file_size, NULL);
+               &audio_file_size, &fd);
        if (ret < 0)
                goto out;
-       ret = compute_afhi(conf.inputs[0], audio_file_data, audio_file_size, &afhi);
+       ret = compute_afhi(conf.inputs[0], audio_file_data, audio_file_size,
+               fd, &afhi);
        if (ret < 0)
                goto out;
        audio_format_num = ret;