Mercurial > octave
changeset 23909:b080ee04f6bf
don't return cs-list from group and password functions
* getgrent.cc (mk_gr_map): Undo change made in f1b2a2dbc0e1. This
function returns an octave_value, so it is not correct to assign an
octave_value_list to retval.
* getpwent.cc (mk_pw_map): Likewise.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 14 Aug 2017 08:39:17 -0400 |
| parents | 3b81ef7b562c |
| children | 445d0ab68193 |
| files | libinterp/corefcn/getgrent.cc libinterp/corefcn/getpwent.cc |
| diffstat | 2 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/getgrent.cc Sat Aug 12 15:55:11 2017 -0700 +++ b/libinterp/corefcn/getgrent.cc Mon Aug 14 08:39:17 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 Sat Aug 12 15:55:11 2017 -0700 +++ b/libinterp/corefcn/getpwent.cc Mon Aug 14 08:39:17 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, ,