Mercurial > octave

changeset 22265:15b9d7cb3098

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unused parameter warnings * audioread.cc (Faudioformats): Mark args unused if ! HAVE_SNDFILE. * xzip.cc (Fgzip): Mark args unused if ! HAVE_Z. (Fbzip2): Mark args unused if ! HAVE_BZ2.
author John W. Eaton <jwe@octave.org>
date Thu, 11 Aug 2016 12:44:00 -0400
parents 9b78fda78300
children 89e1be7b7511
files libinterp/dldfcn/audioread.cc libinterp/dldfcn/xzip.cc
diffstat 2 files changed, 22 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/audioread.cc	Thu Aug 11 12:33:26 2016 -0400
+++ b/libinterp/dldfcn/audioread.cc	Thu Aug 11 12:44:00 2016 -0400
@@ -593,8 +593,12 @@
     }
 
 #else
+
+  octave_unused_parameter (args);
+
   err_disabled_feature ("audioformats",
                         "getting sound formats through libsndfile");
+
 #endif
 
   return octave_value ();
--- a/libinterp/dldfcn/xzip.cc	Thu Aug 11 12:33:26 2016 -0400
+++ b/libinterp/dldfcn/xzip.cc	Thu Aug 11 12:44:00 2016 -0400
@@ -552,10 +552,16 @@
 @seealso{gunzip, unpack, bzip2, zip, tar}
 @end deftypefn */)
 {
-#if ! defined (HAVE_Z)
+#if defined (HAVE_Z)
+
+  return xzip<gz> ("gzip", args);
+
+#else
+
+  octave_unused_parameter (args);
+
   err_disabled_feature ("gzip", "gzip");
-#else
-  return xzip<gz> ("gzip", args);
+
 #endif
 }
 
@@ -589,10 +595,16 @@
 @seealso{bunzip2, unpack, gzip, zip, tar}
 @end deftypefn */)
 {
-#if ! defined (HAVE_BZ2)
+#if defined (HAVE_BZ2)
+
+  return xzip<bz2> ("bzip2", args);
+
+#else
+
+  octave_unused_paramter (args);
+
   err_disabled_feature ("bzip2", "bzip2");
-#else
-  return xzip<bz2> ("bzip2", args);
+
 #endif
 }