Changeset 487 for libmpc/trunk/mpcgain

Timestamp:

01/10/16 22:36:06 (9 years ago)

Author:

r2d

Message:

removed some new gcc warnings

File:

• libmpc/trunk/mpcgain/mpcgain.c (modified) (6 diffs)

libmpc/trunk/mpcgain/mpcgain.c

@@ -116 +116 @@
         while (1) {
                 fseek(file, next_chap_pos, SEEK_SET);
-                fread(buffer, 1, MAX_HEAD_SIZE, file);
+        if (0 == fread(buffer, 1, MAX_HEAD_SIZE, file)) break;
                 r.buff = buffer;
                 r.count = 8;
@@ -183 +183 @@
                 mpc_demux_seek_sample(demux, 0);
                 if (chap_nb > 0) {
-                        mpc_chap_info * chap_info = mpc_demux_chap(demux, chap);
+            const mpc_chap_info * chap_info = mpc_demux_chap(demux, chap);
                         next_chap_sample = chap_info->sample;
                         chap_gain = malloc(sizeof(mpc_uint16_t) * 2 * chap_nb);
@@ -216 +216 @@
                                 cur_sample = next_chap_sample;
                                 if (chap < chap_nb) {
-                                        mpc_chap_info * chap_info = mpc_demux_chap(demux, chap);
+                    const mpc_chap_info * chap_info = mpc_demux_chap(demux, chap);
                                         next_chap_sample = chap_info->sample;
                                 } else
@@ -261 +261 @@
                 }
                 fseek(file, header_pos[j] - 4, SEEK_SET);
-                fread(buffer, 1, 16, file);
-                if (memcmp(buffer, "MPCK", 4) != 0) {
+
+        if (fread(buffer, 1, 16, file) != 16 || memcmp(buffer, "MPCK", 4) != 0) {
                         fprintf(stderr, "Unsupported file format, not a sv8 file : %s\n", argv[j + 1]);
                         fclose(file);
@@ -277 +277 @@
                         header_pos[j] += b.size + size;
                         fseek(file, header_pos[j], SEEK_SET);
-                        fread(buffer, 1, 16, file);
+            if (0 == fread(buffer, 1, 16, file)) break;
                         r.buff = buffer;
                         r.count = 8;
@@ -287 +287 @@
                         continue;
                 }
-                header_pos[j] += size;
+        header_pos[j] += size;
 
                 buffer[size] = 1; // replaygain version