# HG changeset patch # User John W. Eaton # Date 1502714357 14400 # Node ID 212af6615820536c162de0c1262917a07bea033c # Parent 437ba51e8bcf2626058c8ebe8f0c185dd81f42fc 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. diff -r 437ba51e8bcf -r 212af6615820 libinterp/corefcn/getgrent.cc --- a/libinterp/corefcn/getgrent.cc Sat Aug 12 02:23:56 2017 +0200 +++ 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 (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, , diff -r 437ba51e8bcf -r 212af6615820 libinterp/corefcn/getpwent.cc --- a/libinterp/corefcn/getpwent.cc Sat Aug 12 02:23:56 2017 +0200 +++ 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, ,