Mercurial > octave
diff liboctave/system/file-ops.cc @ 29654:d13d090cb03a stable
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc,
Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc,
debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc,
fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc,
graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc,
latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc,
mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h,
pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h,
stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h,
symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc,
audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc,
cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc,
ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h,
ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll,
oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc,
pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc,
pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h,
Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc,
oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc,
mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc,
action-container.cc, action-container.h, base-list.h, caseless-str.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h,
file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h,
lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc,
quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc,
and shared-fcns.h.
(grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | 32f4357ac8d9 7f5bd197fea6 |
line wrap: on
line diff
--- a/liboctave/system/file-ops.cc Wed Apr 28 22:23:39 2021 -0400 +++ b/liboctave/system/file-ops.cc Wed Apr 28 22:57:42 2021 -0400 @@ -75,12 +75,12 @@ // any word separation get desired behavior. static const char *default_suffixes[] = { " ", "\n", ":", nullptr }; - static size_t - tilde_find_prefix (const std::string& s, size_t& len) + static std::size_t + tilde_find_prefix (const std::string& s, std::size_t& len) { len = 0; - size_t s_len = s.length (); + std::size_t s_len = s.length (); if (s_len == 0 || s[0] == '~') return 0; @@ -89,11 +89,11 @@ if (! prefixes.empty ()) { - for (size_t i = 0; i < s_len; i++) + for (std::size_t i = 0; i < s_len; i++) { for (int j = 0; j < prefixes.numel (); j++) { - size_t pfx_len = prefixes[j].length (); + std::size_t pfx_len = prefixes[j].length (); if (prefixes[j] == s.substr (i, pfx_len)) { @@ -110,14 +110,14 @@ // Find the end of a tilde expansion in S, and return the index // of the character which ends the tilde definition. - static size_t + static std::size_t tilde_find_suffix (const std::string& s) { - size_t s_len = s.length (); + std::size_t s_len = s.length (); string_vector suffixes = sys::file_ops::tilde_additional_suffixes; - size_t i = 0; + std::size_t i = 0; for ( ; i < s_len; i++) { @@ -128,7 +128,7 @@ { for (int j = 0; j < suffixes.numel (); j++) { - size_t sfx_len = suffixes[j].length (); + std::size_t sfx_len = suffixes[j].length (); if (suffixes[j] == s.substr (i, sfx_len)) return i; @@ -144,9 +144,9 @@ static std::string isolate_tilde_prefix (const std::string& fname) { - size_t f_len = fname.length (); + std::size_t f_len = fname.length (); - size_t len = 1; + std::size_t len = 1; while (len < f_len && ! sys::file_ops::is_dir_sep (fname[len])) len++; @@ -160,7 +160,7 @@ static std::string tilde_expand_word (const std::string& filename) { - size_t f_len = filename.length (); + std::size_t f_len = filename.length (); if (f_len == 0 || filename[0] != '~') return std::string (filename); @@ -174,7 +174,7 @@ std::string username = isolate_tilde_prefix (filename); - size_t user_len = username.length (); + std::size_t user_len = username.length (); std::string dirname; @@ -291,22 +291,22 @@ { std::string result; - size_t name_len = name.length (); + std::size_t name_len = name.length (); // Scan through S expanding tildes as we come to them. - size_t pos = 0; + std::size_t pos = 0; while (1) { if (pos > name_len) break; - size_t len; + std::size_t len; // Make START point to the tilde which starts the expansion. - size_t start = tilde_find_prefix (name.substr (pos), len); + std::size_t start = tilde_find_prefix (name.substr (pos), len); result.append (name.substr (pos, start)); @@ -317,7 +317,7 @@ // Make FINI be the index of one after the last character of the // username. - size_t fini = tilde_find_suffix (name.substr (pos)); + std::size_t fini = tilde_find_suffix (name.substr (pos)); // If both START and FINI are zero, we are all done. @@ -362,14 +362,14 @@ std::string dirname (const std::string& path) { - size_t ipos = path.find_last_of (dir_sep_chars ()); + std::size_t ipos = path.find_last_of (dir_sep_chars ()); return (ipos != std::string::npos) ? path.substr (0, ipos) : ""; } std::string tail (const std::string& path) { - size_t ipos = path.find_last_of (dir_sep_chars ()); + std::size_t ipos = path.find_last_of (dir_sep_chars ()); if (ipos != std::string::npos) ipos++; @@ -387,8 +387,8 @@ retval = path; else { - size_t n = path.length (); - for (size_t i = 0; i < n; i++) + std::size_t n = path.length (); + for (std::size_t i = 0; i < n; i++) { if (path[i] == '/') retval += dir_sep_char();