Mercurial > octave

diff liboctave/util/url-transfer.cc @ 27933:863ae57eee69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions in liboctave/ * Array-C.cc, Array-d.cc, Array-f.cc, MSparse.cc, Sparse.cc, dim-vector.h, xerbla.cc, aepbalance.cc, eigs-base.cc, gepbalance.cc, oct-fftw.cc, randmtzig.cc, mx-inlines.cc, lo-sysdep.cc, base-list.h, cmd-edit.h, lo-regexp.cc, oct-atomic.h, oct-binmap.h, oct-inttypes.cc, oct-inttypes.h, quit.h, url-transfer.cc: Use Octave coding conventions in liboctave.
author Rik <rik@octave.org>
date Sat, 11 Jan 2020 12:53:20 -0800
parents 265b386f8b20
children c20b7290c778
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc	Fri Jan 10 17:25:12 2020 -0800
+++ b/liboctave/util/url-transfer.cc	Sat Jan 11 12:53:20 2020 -0800
@@ -94,7 +94,7 @@
           {
             m_ok = false;
             m_errmsg = "__ftp_mget__: can not create directory '"
-                     + target + sep + directory + "': " + msg;
+                       + target + sep + directory + "': " + msg;
             return;
           }
       }
@@ -194,7 +194,7 @@
                 {
                   m_ok = false;
                   m_errmsg = "__ftp__mput: file '" + realfile
-                           + "' does not exist";
+                             + "' does not exist";
                   break;
                 }
 
@@ -217,7 +217,7 @@
                     {
                       m_ok = false;
                       m_errmsg = "__ftp_mput__: unable to open file '"
-                               + realfile + "'";
+                                 + realfile + "'";
                       break;
                     }
 
@@ -235,7 +235,7 @@
           {
             m_ok = false;
             m_errmsg = "__ftp_mput__: can not read the directory '"
-                     + realdir + "'";
+                       + realdir + "'";
           }
       }
 
@@ -715,16 +715,16 @@
       frame.add_fcn (curl_slist_free_all, slist);
 
       if (param.numel () >= 2)
-      {
-        for (int i = 0; i < param.numel (); i += 2)
         {
-          std::string header = param(i) + ": " + param(i+1);
+          for (int i = 0; i < param.numel (); i += 2)
+            {
+              std::string header = param(i) + ": " + param(i+1);
 
-          slist = curl_slist_append (slist, header.c_str ());
-        }
+              slist = curl_slist_append (slist, header.c_str ());
+            }
 
-        SETOPT (CURLOPT_HTTPHEADER, slist);
-      }
+          SETOPT (CURLOPT_HTTPHEADER, slist);
+        }
     }
 
     // Sets and sends the form data associated with a transfer.
@@ -743,22 +743,22 @@
       frame.add_fcn (curl_formfree, post);
 
       if (param.numel () >= 2)
-      {
-        for (int i = 0; i < param.numel (); i += 2)
-          {
-            std::string name = param(i);
-            std::string data = param(i+1);
+        {
+          for (int i = 0; i < param.numel (); i += 2)
+            {
+              std::string name = param(i);
+              std::string data = param(i+1);
 
-            if (name == "file")
-               curl_formadd (&post, &last, CURLFORM_COPYNAME, name.c_str (),
-                             CURLFORM_FILE, data.c_str (), CURLFORM_END);
-            else
-               curl_formadd(&post, &last, CURLFORM_COPYNAME, name.c_str (),
-                            CURLFORM_COPYCONTENTS, data.c_str (), CURLFORM_END);
-          }
+              if (name == "file")
+                curl_formadd (&post, &last, CURLFORM_COPYNAME, name.c_str (),
+                              CURLFORM_FILE, data.c_str (), CURLFORM_END);
+              else
+                curl_formadd(&post, &last, CURLFORM_COPYNAME, name.c_str (),
+                             CURLFORM_COPYCONTENTS, data.c_str (), CURLFORM_END);
+            }
 
-        SETOPT (CURLOPT_HTTPPOST, post);
-      }
+          SETOPT (CURLOPT_HTTPPOST, post);
+        }
 
       perform ();
     }
@@ -777,18 +777,18 @@
         SETOPT (CURLOPT_USERAGENT, options.UserAgent.c_str ());
 
       if (! options.Username.empty ())
-      {
-        if (! options.Password.empty ())
-          {
-            std::string tmp = options.Username + ":" + options.Password;
-            SETOPT (CURLOPT_USERPWD, tmp.c_str ());
-          }
-        else
-          {
-            std::string tmp = options.Username + ":";
-            SETOPT (CURLOPT_USERPWD, tmp.c_str ());
-          }
-      }
+        {
+          if (! options.Password.empty ())
+            {
+              std::string tmp = options.Username + ":" + options.Password;
+              SETOPT (CURLOPT_USERPWD, tmp.c_str ());
+            }
+          else
+            {
+              std::string tmp = options.Username + ":";
+              SETOPT (CURLOPT_USERPWD, tmp.c_str ());
+            }
+        }
 
       // Unimplemented.  Only for MATLAB compatibility.
       if (! options.ContentReader.empty ())