Mercurial > octave

changeset 23910:445d0ab68193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge away accidental head.
author John W. Eaton <jwe@octave.org>
date Mon, 14 Aug 2017 09:37:15 -0400
parents b080ee04f6bf (diff) 1e54d9aba433 (current diff)
children 21c2fabd6ed2
files
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/getgrent.cc	Sun Aug 13 17:35:59 2017 +0200
+++ b/libinterp/corefcn/getgrent.cc	Mon Aug 14 09:37:15 2017 -0400
@@ -43,8 +43,6 @@
 static octave_value
 mk_gr_map (const octave::sys::group& gr)
 {
-  octave_value retval;
-
   if (gr)
     {
       octave_scalar_map m;
@@ -54,12 +52,10 @@
       m.assign ("gid", static_cast<double> (gr.gid ()));
       m.assign ("mem", octave_value (gr.mem ()));
 
-      retval = ovl (m);
+      return octave_value (m);
     }
   else
-    retval = ovl (0);
-
-  return retval;
+    return octave_value (0);
 }
 
 DEFUN (getgrent, args, ,
--- a/libinterp/corefcn/getpwent.cc	Sun Aug 13 17:35:59 2017 +0200
+++ b/libinterp/corefcn/getpwent.cc	Mon Aug 14 09:37:15 2017 -0400
@@ -57,12 +57,10 @@
       m.assign ("dir", pw.dir ());
       m.assign ("shell", pw.shell ());
 
-      retval = ovl (m);
+      return octave_value (m);
     }
   else
-    retval = ovl (0);
-
-  return retval;
+    return octave_value (0);
 }
 
 DEFUN (getpwent, args, ,