Changeset 487 for libmpc/trunk/mpcchap/mpcchap.c

Timestamp:

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

Author:

r2d

Message:

removed some new gcc warnings

File:

• libmpc/trunk/mpcchap/mpcchap.c (modified) (10 diffs)

libmpc/trunk/mpcchap/mpcchap.c

@@ -23 +23 @@
 #include "iniparser.h"
 
+#include <inttypes.h>
 #include <sys/stat.h>
 
@@ -83 +84 @@
         char * tmp_buff;
         dictionary * dict;
+    mpc_status ret = MPC_STATUS_OK;
 
         chap_pos = (demux->chap_pos >> 3) + si->header_position;
@@ -90 +92 @@
         stat(mpc_file, &stbuf);
         tmp_buff = malloc(stbuf.st_size - chap_pos - chap_size);
+
         in_file = fopen( mpc_file, "r+b" );
         fseek(in_file, chap_pos + chap_size, SEEK_SET);
-        fread(tmp_buff, 1, stbuf.st_size - chap_pos - chap_size, in_file);
+    if (1 != fread(tmp_buff, stbuf.st_size - chap_pos - chap_size, 1, in_file)) {
+        ret = MPC_STATUS_FAIL;
+        goto error_read_in_file;
+    }
         fseek(in_file, chap_pos, SEEK_SET);
 
@@ -105 +111 @@
 
                 if (chap_pos > si->samples - si->beg_silence)
-                        fprintf(stderr, "warning : chapter %i starts @ %lli samples after the end of the stream (%lli)\n",
-                                i + 1, chap_pos, si->samples - si->beg_silence);
+            fprintf(stderr, "warning : chapter %i starts @ %" PRId64 " samples after the end of the stream (%" PRId64 ")\n",
+                    i + 1, chap_pos, si->samples - si->beg_silence);
 
                 Init_Tags();
@@ -142 +148 @@
 
         fwrite(tmp_buff, 1, stbuf.st_size - chap_pos - chap_size, in_file);
-        ftruncate(fileno(in_file), ftell(in_file));
-
-        fclose(in_file);
-        free(tmp_buff);
-        iniparser_freedict(dict);
-
-        return MPC_STATUS_OK;
+    if (0 != ftruncate(fileno(in_file), ftell(in_file)))
+        ret = MPC_STATUS_FAIL;
+
+    iniparser_freedict(dict);
+error_read_in_file:
+    fclose(in_file);
+    free(tmp_buff);
+
+    return ret;
 }
 
@@ -159 +167 @@
         int chap_pos, end_pos, chap_size, i;
         char * tmp_buff;
+    mpc_status ret = MPC_STATUS_OK;
 
         if (0 == (cd = cf_parse(chap_file, &format))) {
@@ -173 +182 @@
         in_file = fopen( mpc_file, "r+b" );
         fseek(in_file, chap_pos + chap_size, SEEK_SET);
-        fread(tmp_buff, 1, stbuf.st_size - chap_pos - chap_size, in_file);
+    if (1 != fread(tmp_buff, stbuf.st_size - chap_pos - chap_size, 1, in_file)) {
+        ret = MPC_STATUS_FAIL;
+        goto error_read_in_file;
+    }
         fseek(in_file, chap_pos, SEEK_SET);
 
@@ -191 +203 @@
 
                 if (chap_pos > si->samples - si->beg_silence)
-                        fprintf(stderr, "warning : chapter %i starts @ %lli samples after the end of the stream (%lli)\n",
+            fprintf(stderr, "warning : chapter %i starts @ %" PRId64 " samples after the end of the stream (%" PRId64 ")\n",
                                 i, chap_pos, si->samples - si->beg_silence);
 
@@ -225 +237 @@
 
         fwrite(tmp_buff, 1, stbuf.st_size - chap_pos - chap_size, in_file);
-        ftruncate(fileno(in_file), ftell(in_file));
-
+    if (0 != ftruncate(fileno(in_file), ftell(in_file)))
+        ret = MPC_STATUS_FAIL;
+
+error_read_in_file:
         fclose(in_file);
         free(tmp_buff);
 
-        return MPC_STATUS_OK;
+    return ret;
 }
 
@@ -248 +262 @@
         for (i = 0; i < chap_nb; i++) {
                 chap = mpc_demux_chap(demux, i);
-                fprintf(out_file, "[%lli]\ngain=%i\npeak=%i\n", chap->sample, chap->gain, chap->peak);
+        fprintf(out_file, "[%" PRId64 "]\ngain=%i\npeak=%i\n", chap->sample, chap->gain, chap->peak);
                 if (chap->tag_size > 0) {
                         int item_count, j;