Mercurial > octave

diff libinterp/corefcn/__ftp__.cc @ 29961:7d6709900da7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc, besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc, eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc, load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc, mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc, schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc, sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc, andpt-eval.cc.
author John W. Eaton <jwe@octave.org>
date Sat, 14 Aug 2021 22:48:52 -0400
parents 32c3a5805893
children 796f54d4ddbf
line wrap: on
line diff
--- a/libinterp/corefcn/__ftp__.cc	Sat Aug 14 21:50:26 2021 -0400
+++ b/libinterp/corefcn/__ftp__.cc	Sat Aug 14 22:48:52 2021 -0400
@@ -73,10 +73,9 @@
                        ? args(2).xstring_value ("__ftp__: PASSWD must be a string")
                        : "";
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_handle uh = uhm.make_url_handle (host, user, passwd,
-                                               octave_stdout);
+  url_handle uh = uhm.make_url_handle (host, user, passwd, octave_stdout);
 
   return ovl (uh.value ());
 }
@@ -87,9 +86,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_pwd__: invalid ftp handle");
@@ -109,9 +108,9 @@
   if (nargin > 1)
     path = args(1).xstring_value ("__ftp_cwd__: PATH must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_cwd__: invalid ftp handle");
@@ -127,9 +126,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_dir__: invalid ftp handle");
@@ -198,9 +197,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_ascii__: invalid ftp handle");
@@ -216,9 +215,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_binary__: invalid ftp handle");
@@ -234,9 +233,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_handle h = uhm.lookup (args(0));
+  url_handle h = uhm.lookup (args(0));
 
   if (! h.ok ())
     error ("__ftp_close__: invalid ftp handle");
@@ -252,9 +251,9 @@
 Undocumented internal function
 @end deftypefn */)
 {
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_binary__: invalid ftp handle");
@@ -270,9 +269,9 @@
 {
   std::string file = args(1).xstring_value ("__ftp_delete__: FILE must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_delete__: invalid ftp handle");
@@ -290,9 +289,9 @@
 {
   std::string dir = args(1).xstring_value ("__ftp_rmdir__: DIR must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_rmdir__: invalid ftp handle");
@@ -310,9 +309,9 @@
 {
   std::string dir = args(1).xstring_value ("__ftp_mkdir__: DIR must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_mkdir__: invalid ftp handle");
@@ -331,9 +330,9 @@
   std::string oldname = args(1).xstring_value ("__ftp_rename__: OLDNAME must be a string");
   std::string newname = args(2).xstring_value ("__ftp_rename__: NEWNAME must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (url_xfer.is_valid ())
     error ("__ftp_rename__: invalid ftp handle");
@@ -351,23 +350,23 @@
 {
   std::string pat = args(1).xstring_value ("__ftp_mput__: PATTERN must be a string");
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_mput__: invalid ftp handle");
 
   string_vector file_list;
 
-  glob_match pattern (octave::sys::file_ops::tilde_expand (pat));
+  glob_match pattern (sys::file_ops::tilde_expand (pat));
   string_vector files = pattern.glob ();
 
   for (octave_idx_type i = 0; i < files.numel (); i++)
     {
       std::string file = files(i);
 
-      octave::sys::file_stat fs (file);
+      sys::file_stat fs (file);
 
       if (! fs.exists ())
         error ("__ftp__mput: file does not exist");
@@ -383,7 +382,7 @@
         {
           // FIXME: Does ascii mode need to be flagged here?
           std::ifstream ifile =
-            octave::sys::ifstream (file.c_str (),
+            sys::ifstream (file.c_str (),
                                    std::ios::in | std::ios::binary);
 
           if (! ifile.is_open ())
@@ -421,11 +420,11 @@
 
   if (nargin == 3 && ! args(2).isempty ())
     target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string")
-             + octave::sys::file_ops::dir_sep_str ();
+             + sys::file_ops::dir_sep_str ();
 
-  octave::url_handle_manager& uhm = interp.get_url_handle_manager ();
+  url_handle_manager& uhm = interp.get_url_handle_manager ();
 
-  octave::url_transfer url_xfer = uhm.get_object (args(0));
+  url_transfer url_xfer = uhm.get_object (args(0));
 
   if (! url_xfer.is_valid ())
     error ("__ftp_mget__: invalid ftp handle");
@@ -451,15 +450,14 @@
           else
             {
               std::ofstream ofile =
-                octave::sys::ofstream ((target + sv(i)).c_str (),
+                sys::ofstream ((target + sv(i)).c_str (),
                                        std::ios::out | std::ios::binary);
 
               if (! ofile.is_open ())
                 error ("__ftp_mget__: unable to open file");
 
-              int(*unlink_fptr)(const std::string&) = octave::sys::unlink;
-              octave::unwind_action_safe delete_file
-                (unlink_fptr, target + sv(i));
+              int(*unlink_fptr)(const std::string&) = sys::unlink;
+              unwind_action_safe delete_file (unlink_fptr, target + sv(i));
 
               url_xfer.get (sv(i), ofile);