mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove nonnullret deadcode: viminfo_readstring.

Browse Source
This commit is contained in:
Eliseo Martínez
2015-01-23 15:08:09 +01:00
parent d228b8a93e
commit 73c6bd8a42
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/mark.c
View File

@@ -1447,8 +1447,6 @@ void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags
*/ */
str = skipwhite(line + 1); str = skipwhite(line + 1);
str = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE); str = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE);
if (str == NULL)
continue;
p = str + STRLEN(str); p = str + STRLEN(str);
while (p != str && (*p == NUL || vim_isspace(*p))) while (p != str && (*p == NUL || vim_isspace(*p)))
p--; p--;

21
src/nvim/search.c
View File

@@ -4627,18 +4627,15 @@ int read_viminfo_search_pattern(vir_T *virp, int force)
hlsearch_on = TRUE; hlsearch_on = TRUE;
if (idx >= 0) { if (idx >= 0) {
if (force || spats[idx].pat == NULL) { if (force || spats[idx].pat == NULL) {
val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), TRUE);
TRUE); set_last_search_pat(val, idx, magic, setlast);
if (val != NULL) { free(val);
set_last_search_pat(val, idx, magic, setlast); spats[idx].no_scs = no_scs;
free(val); spats[idx].off.line = off_line;
spats[idx].no_scs = no_scs; spats[idx].off.end = off_end;
spats[idx].off.line = off_line; spats[idx].off.off = off;
spats[idx].off.end = off_end; if (setlast) {
spats[idx].off.off = off; SET_NO_HLSEARCH(!hlsearch_on);
if (setlast) {
SET_NO_HLSEARCH(!hlsearch_on);
}
} }
} }
} }