shithub: libvpx

Info  •  Files  •  Log  •  Branches

Explicitly discard fwrite/fread return values

Using if(); triggers an empty body warning with clang

Change-Id: I0fa2ee676400a974b40f8eaafca9ae668107eebb

--- a/examples/decoder_tmpl.txt

+++ b/examples/decoder_tmpl.txt

@@ -48,8 +48,8 @@

     unsigned char *buf =img->planes[plane];

     for(y=0; y < (plane ? (img->d_h + 1) >> 1 : img->d_h); y++) {

-        if(fwrite(buf, 1, (plane ? (img->d_w + 1) >> 1 : img->d_w),

-           outfile));

+        (void) fwrite(buf, 1, (plane ? (img->d_w + 1) >> 1 : img->d_w),

+                      outfile);

         buf += img->stride[plane];

     }

 }

--- a/examples/encoder_tmpl.c

+++ b/examples/encoder_tmpl.c

@@ -85,7 +85,7 @@

     mem_put_le32(header+24, frame_cnt);           /* length */

     mem_put_le32(header+28, 0);                   /* unused */

-    if(fwrite(header, 1, 32, outfile));

+    (void) fwrite(header, 1, 32, outfile);

 }

@@ -103,7 +103,7 @@

     mem_put_le32(header+4, pts&0xFFFFFFFF);

     mem_put_le32(header+8, pts >> 32);

-    if(fwrite(header, 1, 12, outfile));

+    (void) fwrite(header, 1, 12, outfile);

 }

 int main(int argc, char **argv) {

--- a/examples/encoder_tmpl.txt

+++ b/examples/encoder_tmpl.txt

@@ -61,8 +61,8 @@

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PROCESS_FRAME

 case VPX_CODEC_CX_FRAME_PKT:

     write_ivf_frame_header(outfile, pkt);

-    if(fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,

-              outfile));

+    (void) fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,

+                  outfile);

     break;

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PROCESS_FRAME

--- a/vp8/encoder/firstpass.c

+++ b/vp8/encoder/firstpass.c

@@ -853,7 +853,8 @@

         else

             recon_file = fopen(filename, "ab");

-        if(fwrite(lst_yv12->buffer_alloc, lst_yv12->frame_size, 1, recon_file));

+        (void) fwrite(lst_yv12->buffer_alloc, lst_yv12->frame_size, 1,

+                      recon_file);

         fclose(recon_file);

     }

--- a/vp8_multi_resolution_encoder.c

+++ b/vp8_multi_resolution_encoder.c

@@ -164,7 +164,7 @@

     mem_put_le32(header+24, frame_cnt);           /* length */

     mem_put_le32(header+28, 0);                   /* unused */

-    if(fwrite(header, 1, 32, outfile));

+    (void) fwrite(header, 1, 32, outfile);

 }

 static void write_ivf_frame_header(FILE *outfile,

@@ -181,7 +181,7 @@

     mem_put_le32(header+4, pts&0xFFFFFFFF);

     mem_put_le32(header+8, pts >> 32);

-    if(fwrite(header, 1, 12, outfile));

+    (void) fwrite(header, 1, 12, outfile);

 }

 int main(int argc, char **argv)

@@ -410,8 +410,8 @@

                 switch(pkt[i]->kind) {

                     case VPX_CODEC_CX_FRAME_PKT:

                         write_ivf_frame_header(outfile[i], pkt[i]);

-                        if(fwrite(pkt[i]->data.frame.buf, 1, pkt[i]->data.frame.sz,

-                                  outfile[i]));

+                        (void) fwrite(pkt[i]->data.frame.buf, 1,

+                                      pkt[i]->data.frame.sz, outfile[i]);

                     break;

                     case VPX_CODEC_PSNR_PKT:

                         if (show_psnr)

--- a/vp8_scalable_patterns.c

+++ b/vp8_scalable_patterns.c

@@ -93,7 +93,7 @@

     mem_put_le32(header+24, frame_cnt);           /* length */

     mem_put_le32(header+28, 0);                   /* unused */

-    if(fwrite(header, 1, 32, outfile));

+    (void) fwrite(header, 1, 32, outfile);

 }

@@ -111,7 +111,7 @@

     mem_put_le32(header+4, pts&0xFFFFFFFF);

     mem_put_le32(header+8, pts >> 32);

-    if(fwrite(header, 1, 12, outfile));

+    (void) fwrite(header, 1, 12, outfile);

 }

 static int mode_to_num_layers[9] = {2, 2, 3, 3, 3, 3, 5, 2, 3};

@@ -530,8 +530,8 @@

                                               i<cfg.ts_number_layers; i++)

                 {

                     write_ivf_frame_header(outfile[i], pkt);

-                    if (fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,

-                              outfile[i]));

+                    (void) fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,

+                                  outfile[i]);

                     frames_in_layer[i]++;

                 }

                 break;

@@ -562,4 +562,3 @@

     return EXIT_SUCCESS;

 }

-

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -356,7 +356,7 @@

     }

     else

     {

-        if(fwrite(buf, 1, len, out));

+        (void) fwrite(buf, 1, len, out);

     }

 }

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -245,7 +245,7 @@

 {

     if (stats->file)

     {

-        if(fwrite(pkt, 1, len, stats->file));

+        (void) fwrite(pkt, 1, len, stats->file);

     }

     else

     {

@@ -338,7 +338,7 @@

              * write_ivf_frame_header() for documentation on the frame header

              * layout.

              */

-            if(fread(junk, 1, IVF_FRAME_HDR_SZ, f));

+            (void) fread(junk, 1, IVF_FRAME_HDR_SZ, f);

         }

         for (plane = 0; plane < 3; plane++)

@@ -468,7 +468,7 @@

     mem_put_le32(header + 24, frame_cnt);         /* length */

     mem_put_le32(header + 28, 0);                 /* unused */

-    if(fwrite(header, 1, 32, outfile));

+    (void) fwrite(header, 1, 32, outfile);

 }

@@ -486,7 +486,7 @@

     mem_put_le32(header + 4, pts & 0xFFFFFFFF);

     mem_put_le32(header + 8, pts >> 32);

-    if(fwrite(header, 1, 12, outfile));

+    (void) fwrite(header, 1, 12, outfile);

 }

 static void write_ivf_frame_size(FILE *outfile, size_t size)

@@ -493,7 +493,7 @@

 {

     char             header[4];

     mem_put_le32(header, size);

-    fwrite(header, 1, 4, outfile);

+    (void) fwrite(header, 1, 4, outfile);

 }

@@ -541,7 +541,7 @@

 void Ebml_Write(EbmlGlobal *glob, const void *buffer_in, unsigned long len)

 {

-    if(fwrite(buffer_in, 1, len, glob->stream));

+    (void) fwrite(buffer_in, 1, len, glob->stream);

 }

 #define WRITE_BUFFER(s) \

@@ -2259,8 +2259,8 @@

                     }

                 }

-                fwrite(pkt->data.frame.buf, 1,

-                       pkt->data.frame.sz, stream->file);

+                (void) fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,

+                              stream->file);

             }

             stream->nbytes += pkt->data.raw.sz;

             break;