3 files changed, 12 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
index de9ccc0ea..d299cc7ef 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
@@ -79,7 +79,6 @@ class gr_dc_blocker_cc : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   friend gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
index b632d81da..8ffb6cf6f 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
@@ -79,7 +79,6 @@ class gr_dc_blocker_ff : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   friend gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index b8375edc2..8f1c6a2bb 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -160,25 +160,25 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
   
-  fread(&file_size, 1, 4, fp);
+  fresult = fread(&file_size, 1, 4, fp);
   
   fresult = fread(str_buf, 1, 8, fp);
   if (fresult != 8 || strncmp(str_buf, "WAVEfmt ", 8) || feof(fp)) {
     return false;
   }
   
-  fread(&fmt_hdr_skip, 1, 4, fp);
+  fresult = fread(&fmt_hdr_skip, 1, 4, fp);
   
-  fread(&compression_type, 1, 2, fp);
+  fresult = fread(&compression_type, 1, 2, fp);
   if (wav_to_host(compression_type) != VALID_COMPRESSION_TYPE) {
     return false;
   }
   
-  fread(&nchans,            1, 2, fp);
-  fread(&sample_rate,       1, 4, fp);
-  fread(&avg_bytes_per_sec, 1, 4, fp);
-  fread(&block_align,       1, 2, fp);
-  fread(&bits_per_sample,   1, 2, fp);
+  fresult = fread(&nchans,            1, 2, fp);
+  fresult = fread(&sample_rate,       1, 4, fp);
+  fresult = fread(&avg_bytes_per_sec, 1, 4, fp);
+  fresult = fread(&block_align,       1, 2, fp);
+  fresult = fread(&bits_per_sample,   1, 2, fp);
   
   if (ferror(fp)) {
     return false;
@@ -204,7 +204,7 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
 
-  fread(&chunk_size, 1, 4, fp);
+  fresult = fread(&chunk_size, 1, 4, fp);
   if (ferror(fp)) {
     return false;
   }
@@ -226,7 +226,9 @@ short int
 gri_wav_read_sample(FILE *fp, int bytes_per_sample)
 {
   int16_t buf = 0;
-  fread(&buf, bytes_per_sample, 1, fp);
+  size_t fresult;
+
+  fresult = fread(&buf, bytes_per_sample, 1, fp);
   
   return (short) wav_to_host(buf);
 }