Mercurial > octave
diff liboctave/util/url-transfer.cc @ 23807:336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Better performance when string constructor isn't required.
* Figure.cc, __init_qt__.cc, files-dock-widget.cc, file-editor-tab.cc,
file-editor.cc, octave-qscintilla.cc, main-window.cc, octave-dock-widget.cc,
octave-qt-link.cc, parser.cc, webinfo.cc, resource-manager.cc,
settings-dialog.cc, workspace-view.cc, __magick_read__.cc, balance.cc,
debug.cc, dynamic-ld.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc,
graphics.cc, hook-fcn.h, input.cc, load-path.cc, load-save.cc, ls-hdf5.cc,
oct-hist.cc, oct-stream.cc, pager.cc, pr-output.cc, qz.cc, symtab.cc, symtab.h,
tril.cc, __delaunayn__.cc, __init_fltk__.cc, __voronoi__.cc, audioread.cc,
ccolamd.cc, colamd.cc, convhulln.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cx-mat.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-fcn.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-oncleanup.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-str-mat.cc,
ov-struct.cc, ov-usr-fcn.cc, ov.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, pt-funcall.cc, pt-idx.cc, pt-pr-code.cc, pt.h,
Array.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc,
Range.cc, boolSparse.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc,
dRowVector.cc, dSparse.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
idx-vector.cc, intNDArray.cc, CollocWt.cc, DASPK.cc, DASRT.cc, DASSL.cc,
LSODE.cc, oct-time.cc, cmd-hist.cc, kpse.cc, lo-array-errwarn.cc, lo-regexp.cc,
lo-utils.cc, str-vec.cc, url-transfer.cc, main-cli.cc, main-gui.cc,
mkoctfile.in.cc:
Replace 1-character string literals "c" with the character literal 'c'.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 28 Jul 2017 15:40:00 -0700 |
| parents | 08036a7f3660 |
| children | 194eb4bd202b |
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc Fri Jul 28 11:45:07 2017 -0700 +++ b/liboctave/util/url-transfer.cc Fri Jul 28 15:40:00 2017 -0700 @@ -434,7 +434,7 @@ void put (const std::string& file, std::istream& is) { - url = "ftp://" + host_or_url + "/" + file; + url = "ftp://" + host_or_url + '/' + file; SETOPT (CURLOPT_URL, url.c_str ()); SETOPT (CURLOPT_UPLOAD, 1); SETOPT (CURLOPT_NOBODY, 0); @@ -453,7 +453,7 @@ void get (const std::string& file, std::ostream& os) { - url = "ftp://" + host_or_url + "/" + file; + url = "ftp://" + host_or_url + '/' + file; SETOPT (CURLOPT_URL, url.c_str ()); SETOPT (CURLOPT_NOBODY, 0); std::ostream& old_os = set_ostream (os); @@ -470,7 +470,7 @@ void dir (void) { - url = "ftp://" + host_or_url + "/"; + url = "ftp://" + host_or_url + '/'; SETOPT (CURLOPT_URL, url.c_str ()); SETOPT (CURLOPT_NOBODY, 0); @@ -488,7 +488,7 @@ string_vector retval; std::ostringstream buf; - url = "ftp://" + host_or_url + "/"; + url = "ftp://" + host_or_url + '/'; SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (&buf)); SETOPTR (CURLOPT_URL, url.c_str ()); SETOPTR (CURLOPT_DIRLISTONLY, 1); @@ -536,7 +536,7 @@ { std::string path = pwd (); - url = "ftp://" + host_or_url + "/" + path + "/" + filename; + url = "ftp://" + host_or_url + '/' + path + '/' + filename; SETOPT (CURLOPT_URL, url.c_str ()); SETOPT (CURLOPT_FILETIME, 1); SETOPT (CURLOPT_HEADERFUNCTION, throw_away); @@ -575,7 +575,7 @@ // servers I tested with, so cd again into the correct path. Make // the path absolute so that this will work even with servers that // don't end up in the root after an MDTM command. - cwd ("/" + path); + cwd ('/' + path); } std::string pwd (void) @@ -619,7 +619,7 @@ std::string query_string = form_query_string (param); if (! query_string.empty ()) - url += "?" + query_string; + url += '?' + query_string; SETOPT (CURLOPT_URL, url.c_str ()); @@ -683,7 +683,7 @@ // Set the username and password userpwd = user; if (! passwd.empty ()) - userpwd += ":" + passwd; + userpwd += ':' + passwd; if (! userpwd.empty ()) SETOPT (CURLOPT_USERPWD, userpwd.c_str ()); @@ -729,13 +729,13 @@ char *enc_text = curl_easy_escape (curl, text.c_str (), text.length ()); - query << enc_name << "=" << enc_text; + query << enc_name << '=' << enc_text; curl_free (enc_name); curl_free (enc_text); if (i < param.numel ()-1) - query << "&"; + query << '&'; } query.flush (); @@ -752,7 +752,7 @@ frame.add_fcn (curl_slist_free_all, slist); - std::string cmd = action + " " + file_or_dir; + std::string cmd = action + ' ' + file_or_dir; slist = curl_slist_append (slist, cmd.c_str ());