Mercurial > octave

diff libinterp/corefcn/getgrent.cc @ 20939:b17fda023ca6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use new C++ archetype in more files. Place input validation first in files. Move declaration of retval down in function to be closer to point of usage. Eliminate else clause after if () error. Use "return ovl()" where it makes sense. * find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc: Use new C++ archetype in more files.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 15:37:22 -0800
parents f1b2a2dbc0e1
children 48b2ad5ee801
line wrap: on
line diff
--- a/libinterp/corefcn/getgrent.cc	Fri Dec 18 16:22:53 2015 -0500
+++ b/libinterp/corefcn/getgrent.cc	Fri Dec 18 15:37:22 2015 -0800
@@ -71,8 +71,6 @@
 @seealso{setgrent, endgrent}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 0)
     print_usage ();
 
@@ -81,9 +79,7 @@
   // octave_group::getgrent may set msg.
   octave_value val = mk_gr_map (octave_group::getgrent (msg));
 
-  retval = ovl (val, msg);
-
-  return retval;
+  return ovl (val, msg);
 }
 
 DEFUN (getgrgid, args, ,
@@ -96,29 +92,22 @@
 @seealso{getgrnam}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 1)
     print_usage ();
 
   double dval = args(0).double_value ();
 
-  if (D_NINT (dval) == dval)
-    {
-      gid_t gid = static_cast<gid_t> (dval);
-
-      std::string msg;
-
-      // octave_group::getgrgid may set msg.
-      octave_value val = mk_gr_map (octave_group::getgrgid (gid, msg));
-
-      retval = ovl (val, msg);
-    }
-
-  else
+  if (D_NINT (dval) != dval)
     error ("getgrgid: GID must be an integer");
 
-  return retval;
+  gid_t gid = static_cast<gid_t> (dval);
+
+  std::string msg;
+
+  // octave_group::getgrgid may set msg.
+  octave_value val = mk_gr_map (octave_group::getgrgid (gid, msg));
+
+  return ovl (val, msg);
 }
 
 DEFUN (getgrnam, args, ,
@@ -131,8 +120,6 @@
 @seealso{getgrgid}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 1)
     print_usage ();
 
@@ -143,9 +130,7 @@
   // octave_group::getgrnam may set msg.
   octave_value val = mk_gr_map (octave_group::getgrnam (s.c_str (), msg));
 
-  retval = ovl (val, msg);
-
-  return retval;
+  return ovl (val, msg);
 }
 
 DEFUN (setgrent, args, ,
@@ -155,8 +140,6 @@
 @seealso{getgrent, endgrent}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 0)
     print_usage ();
 
@@ -165,9 +148,7 @@
   // octave_group::setgrent may set msg.
   int status = octave_group::setgrent (msg);
 
-  retval = ovl (static_cast<double> (status), msg);
-
-  return retval;
+  return ovl (static_cast<double> (status), msg);
 }
 
 DEFUN (endgrent, args, ,
@@ -177,8 +158,6 @@
 @seealso{getgrent, setgrent}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 0)
     print_usage ();
 
@@ -187,7 +166,5 @@
   // octave_group::endgrent may set msg.
   int status = octave_group::endgrent (msg);
 
-  retval = ovl (static_cast<double> (status), msg);
-
-  return retval;
+  return ovl (static_cast<double> (status), msg);
 }