diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-01-23 15:08:09 +0100 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-01-27 01:33:33 +0100 |
| commit | 73c6bd8a4223b0a3888fe70b62847ce1e22a1783 (patch) | |
| tree | f2ac409fa1bcaf4f10f5eb74c7e72f67bc2e176a | |
| parent | d228b8a93e8586c36c1b1aa71d0d3dc8c52f137e (diff) | |
| download | rneovim-73c6bd8a4223b0a3888fe70b62847ce1e22a1783.tar.gz rneovim-73c6bd8a4223b0a3888fe70b62847ce1e22a1783.tar.bz2 rneovim-73c6bd8a4223b0a3888fe70b62847ce1e22a1783.zip | |
Remove nonnullret deadcode: viminfo_readstring.
| -rw-r--r-- | src/nvim/mark.c | 2 | ||||
| -rw-r--r-- | src/nvim/search.c | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 74f3f8bdbf..5853b535cd 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -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 = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE); - if (str == NULL) - continue; p = str + STRLEN(str); while (p != str && (*p == NUL || vim_isspace(*p))) p--; diff --git a/src/nvim/search.c b/src/nvim/search.c index e2781f17d5..0721cb8fac 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -4627,18 +4627,15 @@ int read_viminfo_search_pattern(vir_T *virp, int force) hlsearch_on = TRUE; if (idx >= 0) { if (force || spats[idx].pat == NULL) { - val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), - TRUE); - if (val != NULL) { - set_last_search_pat(val, idx, magic, setlast); - free(val); - spats[idx].no_scs = no_scs; - spats[idx].off.line = off_line; - spats[idx].off.end = off_end; - spats[idx].off.off = off; - if (setlast) { - SET_NO_HLSEARCH(!hlsearch_on); - } + val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), TRUE); + set_last_search_pat(val, idx, magic, setlast); + free(val); + spats[idx].no_scs = no_scs; + spats[idx].off.line = off_line; + spats[idx].off.end = off_end; + spats[idx].off.off = off; + if (setlast) { + SET_NO_HLSEARCH(!hlsearch_on); } } } |