Mercurial > octave-nkf

diff libinterp/corefcn/urlwrite.cc @ 20592:56fee8f84fe7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * cellfun.cc, syscalls.cc, urlwrite.cc, ov.cc, pt-eval.cc: Eliminate uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 22:47:42 -0400
parents 7ac907da9fba
children 7374a3a6d594
line wrap: on
line diff
--- a/libinterp/corefcn/urlwrite.cc	Mon Oct 05 21:37:03 2015 -0400
+++ b/libinterp/corefcn/urlwrite.cc	Mon Oct 05 22:47:42 2015 -0400
@@ -607,14 +607,10 @@
       if (nargin > 2)
         passwd = args(2).string_value ();
 
-      if (! error_state)
-        {
-          curl_handle ch
-            = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
+      curl_handle ch
+        = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
 
-          if (! error_state)
-            retval = ch.value ();
-        }
+      retval = ch.value ();
     }
 
   return retval;
@@ -636,9 +632,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         retval = curl.pwd ();
       else
@@ -664,9 +657,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string path = "";
@@ -702,9 +692,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           if (nargout == 0)
@@ -783,9 +770,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         curl.ascii ();
       else
@@ -811,9 +795,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         curl.binary ();
       else
@@ -839,9 +820,6 @@
     {
       curl_handle h = ch_manager::lookup (args(0));
 
-      if (error_state)
-        return retval;
-
       if (h.ok ())
         ch_manager::free (h);
       else
@@ -867,9 +845,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         retval = (curl.is_ascii () ? "ascii" : "binary");
       else
@@ -895,9 +870,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string file = args(1).string_value ();
@@ -930,9 +902,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string dir = args(1).string_value ();
@@ -965,9 +934,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string dir = args(1).string_value ();
@@ -1000,9 +966,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string oldname = args(1).string_value ();
@@ -1036,9 +999,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string pat = args(1).string_value ();
@@ -1127,9 +1087,6 @@
     {
       url_transfer curl = ch_manager::get_object (args(0));
 
-      if (error_state)
-        return retval;
-
       if (curl.is_valid ())
         {
           std::string file = args(1).string_value ();