diff options
| author | dundargoc <gocdundar@gmail.com> | 2023-09-29 14:58:48 +0200 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-10-09 11:45:46 +0200 |
| commit | 8e932480f61d6101bf8bea1abc07ed93826221fd (patch) | |
| tree | 06cf8d0af6e786aba6d01343c54ba52b01738daa /src/nvim/regexp.c | |
| parent | dacd34364ff3af98bc2d357c43e3ce06638e2ce9 (diff) | |
| download | rneovim-8e932480f61d6101bf8bea1abc07ed93826221fd.tar.gz rneovim-8e932480f61d6101bf8bea1abc07ed93826221fd.tar.bz2 rneovim-8e932480f61d6101bf8bea1abc07ed93826221fd.zip | |
refactor: the long goodbye
long is 32 bits on windows, while it is 64 bits on other architectures.
This makes the type suboptimal for a codebase meant to be
cross-platform. Replace it with more appropriate integer types.
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 3f792cd8d5..568f399664 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -893,11 +893,11 @@ static int64_t getoctchrs(void) // If the first character is '-', then the range is reversed. // Should end with 'end'. If minval is missing, zero is default, if maxval is // missing, a very big number is the default. -static int read_limits(long *minval, long *maxval) +static int read_limits(int *minval, int *maxval) { int reverse = false; char *first_char; - long tmp; + int tmp; if (*regparse == '-') { // Starts with '-', so reverse the range later. @@ -905,10 +905,10 @@ static int read_limits(long *minval, long *maxval) reverse = true; } first_char = regparse; - *minval = getdigits_long(®parse, false, 0); + *minval = getdigits_int(®parse, false, 0); if (*regparse == ',') { // There is a comma. if (ascii_isdigit(*++regparse)) { - *maxval = getdigits_long(®parse, false, MAX_LIMIT); + *maxval = getdigits_int(®parse, false, MAX_LIMIT); } else { *maxval = MAX_LIMIT; } @@ -2515,8 +2515,8 @@ bool vim_regexec_nl(regmatch_T *rmp, const char *line, colnr_T col) /// /// @return zero if there is no match. Return number of lines contained in the /// match otherwise. -long vim_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, - proftime_T *tm, int *timed_out) +int vim_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, + proftime_T *tm, int *timed_out) FUNC_ATTR_NONNULL_ARG(1) { regexec_T rex_save; @@ -2535,7 +2535,7 @@ long vim_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, } rex_in_use = true; - long result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col, tm, timed_out); + int result = rmp->regprog->engine->regexec_multi(rmp, win, buf, lnum, col, tm, timed_out); rmp->regprog->re_in_use = false; // NFA engine aborted because it's very slow, use backtracking engine instead. |