Mercurial > jwe > octave

changeset 30116:4eddc4cba4e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit output from gzip or bzip2 if nargout is zero * gzip.cc (Fgzip, Fbzip2): Only return output if nargout > 0.
author John W. Eaton <jwe@octave.org>
date Thu, 02 Sep 2021 17:55:44 -0400
parents 9080316864bf
children 167747278b7a
files libinterp/dldfcn/gzip.cc
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/gzip.cc	Thu Sep 02 11:40:04 2021 -0400
+++ b/libinterp/dldfcn/gzip.cc	Thu Sep 02 17:55:44 2021 -0400
@@ -595,7 +595,7 @@
       }
   }
 
-DEFUN_DLD (gzip, args, ,
+DEFUN_DLD (gzip, args, nargout,
            doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{filelist} =} gzip (@var{files})
 @deftypefnx {} {@var{filelist} =} gzip (@var{files}, @var{dir})
@@ -623,7 +623,9 @@
 {
 #if defined (HAVE_Z)
 
-  return xzip<gz> ("gzip", args);
+  octave_value_list retval = xzip<gz> ("gzip", args);
+
+  return (nargout > 0 ? retval : octave_value_list ());
 
 #else
 
@@ -640,7 +642,7 @@
 %!error <FILES must be a character array or cellstr|was unavailable or disabled> gzip (1)
 */
 
-DEFUN_DLD (bzip2, args, ,
+DEFUN_DLD (bzip2, args, nargout,
            doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{filelist} =} bzip2 (@var{files})
 @deftypefnx {} {@var{filelist} =} bzip2 (@var{files}, @var{dir})
@@ -666,7 +668,9 @@
 {
 #if defined (HAVE_BZ2)
 
-  return xzip<bz2> ("bzip2", args);
+  octave_value_list retval = xzip<bz2> ("bzip2", args);
+
+  return (nargout > 0 ? retval : octave_value_list ());
 
 #else