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/ops.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/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 348a86a0f6..f4eaf3a320 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -2202,7 +2202,7 @@ bool swapchar(int op_type, pos_T *pos) } /// Insert and append operators for Visual mode. -void op_insert(oparg_T *oap, long count1) +void op_insert(oparg_T *oap, int count1) { int pre_textlen = 0; char *firstline; @@ -2491,7 +2491,7 @@ int op_change(oparg_T *oap) ins_len = (int)strlen(firstline) - pre_textlen; if (ins_len > 0) { - long offset; + int offset; char *newp; char *oldp; // Subsequent calls to ml_get() flush the firstline data - take a @@ -2932,7 +2932,7 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags) pos_T old_pos; char *insert_string = NULL; bool allocated = false; - long cnt; + int cnt; const pos_T orig_start = curbuf->b_op_start; const pos_T orig_end = curbuf->b_op_end; unsigned cur_ve_flags = get_ve_flags(); @@ -3334,7 +3334,7 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags) ptr += bd.startspaces; // insert the new text - for (long j = 0; j < count; j++) { + for (int j = 0; j < count; j++) { memmove(ptr, y_array[i], (size_t)yanklen); ptr += yanklen; @@ -5339,7 +5339,7 @@ void cursor_pos_info(dict_T *dict) linenr_T lnum; int eol_size; varnumber_T last_check = 100000L; - long line_count_selected = 0; + int line_count_selected = 0; if (get_fileformat(curbuf) == EOL_DOS) { eol_size = 2; } else { @@ -5398,7 +5398,7 @@ void cursor_pos_info(dict_T *dict) if (l_VIsual_active && lnum >= min_pos.lnum && lnum <= max_pos.lnum) { char *s = NULL; - long len = 0L; + int len = 0L; switch (l_VIsual_mode) { case Ctrl_V: @@ -5406,7 +5406,7 @@ void cursor_pos_info(dict_T *dict) block_prep(&oparg, &bd, lnum, false); virtual_op = kNone; s = bd.textstart; - len = (long)bd.textlen; + len = bd.textlen; break; case 'V': s = ml_get(lnum); @@ -5429,7 +5429,7 @@ void cursor_pos_info(dict_T *dict) if (lnum == curbuf->b_ml.ml_line_count && !curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol) - && (long)strlen(s) < len) { + && (int)strlen(s) < len) { byte_count_cursor -= eol_size; } } |