Merge pull request #1867 from elmart/nonnull-deadcode

Remove deadcode due to nonnullret funcs.

1 files changed, 8 insertions, 14 deletions

diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index cfc702f189..5853b535cd 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -506,8 +506,6 @@ void fmarks_check_names(buf_T *buf)
     return;
 
   name = home_replace_save(buf, buf->b_ffname);
-  if (name == NULL)
-    return;
 
   for (i = 0; i < NMARKS + EXTRA_MARKS; ++i)
     fmarks_check_one(&namedfm[i], name, buf);
@@ -1327,19 +1325,17 @@ int removable(char_u *name)
   size_t n;
 
   name = home_replace_save(NULL, name);
-  if (name != NULL) {
-    for (p = p_viminfo; *p; ) {
-      copy_option_part(&p, part, 51, ", ");
-      if (part[0] == 'r') {
-        n = STRLEN(part + 1);
-        if (MB_STRNICMP(part + 1, name, n) == 0) {
-          retval = TRUE;
-          break;
-        }
+  for (p = p_viminfo; *p; ) {
+    copy_option_part(&p, part, 51, ", ");
+    if (part[0] == 'r') {
+      n = STRLEN(part + 1);
+      if (MB_STRNICMP(part + 1, name, n) == 0) {
+        retval = TRUE;
+        break;
       }
     }
-    free(name);
   }
+  free(name);
   return retval;
 }
 
@@ -1451,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--;