Mercurial > octave

changeset 20875:a778c2427f2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2015 Code Sprint: urlwrite.cc: use ovl ().
author Rik <rik@octave.org>
date Sat, 12 Dec 2015 10:34:05 -0800
parents d112e04d1271
children ec8c8977b0be
files libinterp/corefcn/urlwrite.cc
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/urlwrite.cc	Sat Dec 12 10:33:22 2015 -0800
+++ b/libinterp/corefcn/urlwrite.cc	Sat Dec 12 10:34:05 2015 -0800
@@ -389,15 +389,13 @@
         {
           if (curl.good ())
             {
-              retval(2) = std::string ();
-              retval(1) = true;
-              retval(0) = octave_env::make_absolute (filename);
+              retval = ovl (octave_env::make_absolute (filename),
+                            true,
+                            std::string ());
             }
           else
             {
-              retval(2) = curl.lasterror ();
-              retval(1) = false;
-              retval(0) = std::string ();
+              retval = ovl (std::string (), false, curl.lasterror ());
             }
         }
 
@@ -491,10 +489,9 @@
 
       if (nargout > 0)
         {
-          // Return empty string if no error occured.
-          retval(2) = curl.good () ? "" : curl.lasterror ();
-          retval(1) = curl.good ();
-          retval(0) = buf.str ();
+          // Return empty string if no error occurred.
+          retval = ovl (buf.str (), curl.good (),
+                        curl.good () ? "" : curl.lasterror ());
         }
 
       if (nargout < 2 && ! curl.good ())