Mercurial > octave

diff libinterp/corefcn/getpwent.cc @ 20803:c22206c1a88f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate return statements after calls to print_usage * __ilu__.cc, besselj.cc, conv2.cc, error.cc, getgrent.cc, getpwent.cc, help.cc, load-path.cc, sparse.cc: Eliminate return statements after calls to print_usage. * mode.m: Fix test.
author John W. Eaton <jwe@octave.org>
date Fri, 04 Dec 2015 14:06:41 -0500
parents f90c8372b7ba
children 1142cf6abc0d
line wrap: on
line diff
--- a/libinterp/corefcn/getpwent.cc	Fri Dec 04 12:03:44 2015 -0500
+++ b/libinterp/corefcn/getpwent.cc	Fri Dec 04 14:06:41 2015 -0500
@@ -77,20 +77,16 @@
 {
   octave_value_list retval;
 
-  retval(1) = std::string ();
-  retval(0) = 0;
+  if (args.length () != 0)
+    print_usage ();
 
-  int nargin = args.length ();
+  std::string msg;
 
-  if (nargin == 0)
-    {
-      std::string msg;
+  // octave_passwd::getpwent may set msg.
+  octave_value val = mk_pw_map (octave_passwd::getpwent (msg));
 
-      retval(1) = msg;
-      retval(0) = mk_pw_map (octave_passwd::getpwent (msg));
-    }
-  else
-    print_usage ();
+  retval(1) = msg;
+  retval(0) = val;
 
   return retval;
 }
@@ -107,29 +103,25 @@
 {
   octave_value_list retval;
 
-  retval(1) = std::string ();
-  retval(0) = 0;
+  if (args.length () != 1)
+    print_usage ();
 
-  int nargin = args.length ();
-
-  if (nargin == 1)
-    {
-      double dval = args(0).double_value ();
+  double dval = args(0).double_value ();
 
-      if (D_NINT (dval) == dval)
-        {
-          uid_t uid = static_cast<uid_t> (dval);
+  if (D_NINT (dval) == dval)
+    {
+      uid_t uid = static_cast<uid_t> (dval);
 
-          std::string msg;
+      std::string msg;
 
-          retval(1) = msg;
-          retval(0) = mk_pw_map (octave_passwd::getpwuid (uid, msg));
-        }
-      else
-        error ("getpwuid: UID must be an integer");
+      // octave_passwd::getpwuid may set msg.
+      octave_value val = mk_pw_map (octave_passwd::getpwuid (uid, msg));
+
+      retval(1) = msg;
+      retval(0) = val;
     }
   else
-    print_usage ();
+    error ("getpwuid: UID must be an integer");
 
   return retval;
 }
@@ -146,22 +138,18 @@
 {
   octave_value_list retval;
 
-  retval(1) = std::string ();
-  retval(0) = 0.0;
+  if (args.length () != 1)
+    print_usage ();
 
-  int nargin = args.length ();
+  std::string s = args(0).string_value ();
 
-  if (nargin == 1)
-    {
-      std::string s = args(0).string_value ();
-
-      std::string msg;
+  std::string msg;
 
-      retval(1) = msg;
-      retval(0) = mk_pw_map (octave_passwd::getpwnam (s, msg));
-    }
-  else
-    print_usage ();
+  // octave_passwd::getpwnam may set msg.
+  octave_value val = mk_pw_map (octave_passwd::getpwnam (s, msg));
+
+  retval(1) = msg;
+  retval(0) = val;
 
   return retval;
 }
@@ -175,20 +163,16 @@
 {
   octave_value_list retval;
 
-  retval(1) = std::string ();
-  retval(0) = -1.0;
+  if (args.length () != 0)
+    print_usage ();
 
-  int nargin = args.length ();
+  std::string msg;
 
-  if (nargin == 0)
-    {
-      std::string msg;
+  // octave_passwd::setpwent may set msg.
+  int status = octave_passwd::setpwent (msg);
 
-      retval(1) = msg;
-      retval(0) = static_cast<double> (octave_passwd::setpwent (msg));
-    }
-  else
-    print_usage ();
+  retval(1) = msg;
+  retval(0) = static_cast<double> (status);
 
   return retval;
 }
@@ -202,20 +186,16 @@
 {
   octave_value_list retval;
 
-  retval(1) = std::string ();
-  retval(0) = -1.0;
+  if (args.length () != 0)
+    print_usage ();
 
-  int nargin = args.length ();
+  std::string msg;
 
-  if (nargin == 0)
-    {
-      std::string msg;
+  // octave_passwd::endpwent may set msg.
+  int status = octave_passwd::endpwent (msg);
 
-      retval(1) = msg;
-      retval(0) = static_cast<double> (octave_passwd::endpwent (msg));
-    }
-  else
-    print_usage ();
+  retval(1) = msg;
+  retval(0) = static_cast<double> (status);
 
   return retval;
 }