mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 05:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fold: add const to foldSplit() variables

Browse Source
This commit is contained in:
Jan Edmund Lazo
2018-08-02 18:29:16 -04:00
parent 6710522751
commit 766683622a
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/fold.c
View File

@@ -2527,19 +2527,15 @@ static void foldInsert(garray_T *gap, int i)
* The caller must first have taken care of any nested folds from "top" to * The caller must first have taken care of any nested folds from "top" to
* "bot"! * "bot"!
*/ */
static void foldSplit(garray_T *gap, int i, linenr_T top, linenr_T bot) static void foldSplit(garray_T *const gap, const int i, const linenr_T top,
const linenr_T bot)
{ {
fold_T *fp;
fold_T *fp2; fold_T *fp2;
garray_T *gap1;
garray_T *gap2;
int idx;
int len;
/* The fold continues below bot, need to split it. */ /* The fold continues below bot, need to split it. */
foldInsert(gap, i + 1); foldInsert(gap, i + 1);
fp = (fold_T *)gap->ga_data + i; fold_T *const fp = (fold_T *)gap->ga_data + i;
fp[1].fd_top = bot + 1; fp[1].fd_top = bot + 1;
// check for wrap around (MAXLNUM, and 32bit) // check for wrap around (MAXLNUM, and 32bit)
assert(fp[1].fd_top > bot); assert(fp[1].fd_top > bot);
@@ -2550,13 +2546,13 @@ static void foldSplit(garray_T *gap, int i, linenr_T top, linenr_T bot)
/* Move nested folds below bot to new fold. There can't be /* Move nested folds below bot to new fold. There can't be
* any between top and bot, they have been removed by the caller. */ * any between top and bot, they have been removed by the caller. */
gap1 = &fp->fd_nested; garray_T *const gap1 = &fp->fd_nested;
gap2 = &fp[1].fd_nested; garray_T *const gap2 = &fp[1].fd_nested;
(void)(foldFind(gap1, bot + 1 - fp->fd_top, &fp2)); (void)(foldFind(gap1, bot + 1 - fp->fd_top, &fp2));
len = (int)((fold_T *)gap1->ga_data + gap1->ga_len - fp2); const int len = (int)((fold_T *)gap1->ga_data + gap1->ga_len - fp2);
if (len > 0) { if (len > 0) {
ga_grow(gap2, len); ga_grow(gap2, len);
for (idx = 0; idx < len; ++idx) { for (int idx = 0; idx < len; idx++) {
((fold_T *)gap2->ga_data)[idx] = fp2[idx]; ((fold_T *)gap2->ga_data)[idx] = fp2[idx];
((fold_T *)gap2->ga_data)[idx].fd_top ((fold_T *)gap2->ga_data)[idx].fd_top
-= fp[1].fd_top - fp->fd_top; -= fp[1].fd_top - fp->fd_top;