Mercurial > hg > octave-jordi
diff libinterp/corefcn/urlwrite.cc @ 20699:68e3a747ca02
rename octave_value value extractors that accept error message args
* ov.h, ov.cc (octave_value::xcell_value, octave_value::xstring_value,
octave_value::xcellstr_value): Rename functions that accept error
message args. Handle error directly. Only forward to functions that
don't attempt type conversion. Change all uses.
* ov-base.h, ov-base.cc (octave_base_value::xstring_value): Don't do
type conversion.
(octave_base_value::cell_value, octave_base_value::cellstr_value):
Delete versions that accept error message args.
* ov-str-mat.h, ov-str-mat.cc (octave_char_matrix_str::string_value,
octave_char_matrix_str::cell_value): Delete.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 13 Nov 2015 14:10:26 -0500 (2015-11-13) |
| parents | b0b37f0d7e6d |
| children | 73800f39da6f |
line wrap: on
line diff
--- a/libinterp/corefcn/urlwrite.cc +++ b/libinterp/corefcn/urlwrite.cc @@ -345,17 +345,17 @@ return retval; } - std::string url = args(0).string_value ("urlwrite: URL must be a string"); + std::string url = args(0).xstring_value ("urlwrite: URL must be a string"); // name to store the file if download is succesful - std::string filename = args(1).string_value ("urlwrite: LOCALFILE must be a string"); + std::string filename = args(1).xstring_value ("urlwrite: LOCALFILE must be a string"); std::string method; Array<std::string> param; if (nargin == 4) { - method = args(2).string_value ("urlwrite: METHOD must be a string"); + method = args(2).xstring_value ("urlwrite: METHOD must be a string"); if (method != "get" && method != "post") { @@ -363,7 +363,7 @@ return retval; } - param = args(3).cellstr_value ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings"); + param = args(3).xcellstr_value ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings"); if (param.numel () % 2 == 1) { @@ -482,14 +482,14 @@ return retval; } - std::string url = args(0).string_value ("urlread: URL must be a string"); + std::string url = args(0).xstring_value ("urlread: URL must be a string"); std::string method; Array<std::string> param; if (nargin == 3) { - method = args(1).string_value ("urlread: METHOD must be a string"); + method = args(1).xstring_value ("urlread: METHOD must be a string"); if (method != "get" && method != "post") { @@ -497,7 +497,7 @@ return retval; } - param = args(2).cellstr_value ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings"); + param = args(2).xcellstr_value ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings"); if (param.numel () % 2 == 1) { @@ -552,13 +552,13 @@ } else { - host = args(0).string_value ("__ftp__: HOST must be a string"); + host = args(0).xstring_value ("__ftp__: HOST must be a string"); if (nargin > 1) - user = args(1).string_value ("__ftp__: USER must be a string"); + user = args(1).xstring_value ("__ftp__: USER must be a string"); if (nargin > 2) - passwd = args(2).string_value ("__ftp__: PASSWD must be a string"); + passwd = args(2).xstring_value ("__ftp__: PASSWD must be a string"); curl_handle ch = ch_manager::make_curl_handle (host, user, passwd, octave_stdout); @@ -615,7 +615,7 @@ std::string path = ""; if (nargin > 1) - path = args(1).string_value ("__ftp_cwd__: PATH must be a string"); + path = args(1).xstring_value ("__ftp_cwd__: PATH must be a string"); curl.cwd (path); } @@ -822,7 +822,7 @@ if (curl.is_valid ()) { - std::string file = args(1).string_value ("__ftp_delete__: FILE must be a string"); + std::string file = args(1).xstring_value ("__ftp_delete__: FILE must be a string"); curl.del (file); } @@ -851,7 +851,7 @@ if (curl.is_valid ()) { - std::string dir = args(1).string_value ("__ftp_rmdir__: DIR must be a string"); + std::string dir = args(1).xstring_value ("__ftp_rmdir__: DIR must be a string"); curl.rmdir (dir); } @@ -880,7 +880,7 @@ if (curl.is_valid ()) { - std::string dir = args(1).string_value ("__ftp_mkdir__: DIR must be a string"); + std::string dir = args(1).xstring_value ("__ftp_mkdir__: DIR must be a string"); curl.mkdir (dir); } @@ -909,8 +909,8 @@ if (curl.is_valid ()) { - std::string oldname = args(1).string_value ("__ftp_rename__: OLDNAME must be a string"); - std::string newname = args(2).string_value ("__ftp_rename__: NEWNAME must be a string"); + 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"); curl.rename (oldname, newname); } @@ -939,7 +939,7 @@ if (curl.is_valid ()) { - std::string pat = args(1).string_value ("__ftp_mput__: PATTERN must be a string"); + std::string pat = args(1).xstring_value ("__ftp_mput__: PATTERN must be a string"); string_vector file_list; @@ -1023,11 +1023,11 @@ if (curl.is_valid ()) { - std::string file = args(1).string_value ("__ftp_mget__: PATTERN must be a string"); + std::string file = args(1).xstring_value ("__ftp_mget__: PATTERN must be a string"); std::string target; if (nargin == 3) - target = args(2).string_value ("__ftp_mget__: TARGET must be a string") + file_ops::dir_sep_str (); + target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string") + file_ops::dir_sep_str (); string_vector sv = curl.list (); octave_idx_type n = 0;