patch 8.2.1102: Coverity gets confused by an unnecessary NULL check

Problem:    Coverity gets confused by an unnecessary NULL check.
Solution:   Remove the check for NULL.

diff --git a/src/quickfix.c b/src/quickfix.c
index 091246b764100844fa28a34d882d778378fb8ad7..a7d211822a24ad62f6cb2b485a47209b64836603 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -7374,6 +7374,7 @@ qf_free_stack(win_T *wp, qf_info_T *qi)
  * Populate the quickfix list with the items supplied in the list
  * of dictionaries. "title" will be copied to w:quickfix_title.
  * "action" is 'a' for add, 'r' for replace.  Otherwise create a new list.
+ * When "what" is not NULL then only set some properties.
  */
     int
 set_errorlist(
@@ -7401,7 +7402,7 @@ set_errorlist(
     }
 
     // A dict argument cannot be specified with a non-empty list argument
-    if (list != NULL && list->lv_len != 0 && what != NULL)
+    if (list->lv_len != 0 && what != NULL)
     {
        semsg(_(e_invarg2),
                         _("cannot have both a list and a \"what\" argument"));
@@ -8106,7 +8107,7 @@ set_qf_ll_list(
     else
     {
        list_T  *l = list_arg->vval.v_list;
-       dict_T  *d = NULL;
+       dict_T  *what = NULL;
        int     valid_dict = TRUE;
 
        if (action_arg->v_type == VAR_STRING)
@@ -8128,8 +8129,8 @@ set_qf_ll_list(
        if (action_arg->v_type != VAR_UNKNOWN
                && what_arg->v_type != VAR_UNKNOWN)
        {
-           if (what_arg->v_type == VAR_DICT)
-               d = what_arg->vval.v_dict;
+           if (what_arg->v_type == VAR_DICT && what_arg->vval.v_dict != NULL)
+               what = what_arg->vval.v_dict;
            else
            {
                emsg(_(e_dictreq));
@@ -8138,9 +8139,10 @@ set_qf_ll_list(
        }
 
        ++recursive;
-       if (l != NULL && action && valid_dict && set_errorlist(wp, l, action,
+       if (l != NULL && action && valid_dict
+                   && set_errorlist(wp, l, action,
                     (char_u *)(wp == NULL ? ":setqflist()" : ":setloclist()"),
-                    d) == OK)
+                    what) == OK)
            rettv->vval.v_number = 0;
        --recursive;
     }

diff --git a/src/version.c b/src/version.c
index f1b0be6f690d028edcc0ae8fbdc3461e067f5272..26eb42a405b56e4d2fb10f959d1a7ff1a9f6fdb4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1102,
 /**/
     1101,
 /**/