patch 9.1.0448: compiler warning in eval.c

Problem:  compiler warning in eval.c (after v9.1.0429)
Solution: refactor code (Yegappan Lakshmanan)

fixes: #14847
closes: #14867

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/eval.c b/src/eval.c
index 8583610734033da7b690092ae2a911c978aada02..b08f29657683c96cbf9f96a57f66467d0180383f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -5761,22 +5761,31 @@ func_tv2string(typval_T *tv, char_u **tofree, int echo_style)
 
     if (echo_style)
     {
-       r = tv->vval.v_string == NULL ? (char_u *)"function()"
-                               : make_ufunc_name_readable(tv->vval.v_string,
-                                               buf, MAX_FUNC_NAME_LEN);
-       if (r == buf && tv->vval.v_string != NULL)
+       if (tv->vval.v_string == NULL)
        {
-           r = vim_strsave(buf);
-           *tofree = r;
+           r = (char_u *)"function()";
+           *tofree = NULL;
        }
        else
-           *tofree = NULL;
+       {
+           r = make_ufunc_name_readable(tv->vval.v_string, buf,
+                                                       MAX_FUNC_NAME_LEN);
+           if (r == buf)
+           {
+               r = vim_strsave(buf);
+               *tofree = r;
+           }
+           else
+               *tofree = NULL;
+       }
     }
     else
     {
-       *tofree = string_quote(tv->vval.v_string == NULL ? NULL
-                               : make_ufunc_name_readable(tv->vval.v_string,
-                                       buf, MAX_FUNC_NAME_LEN), TRUE);
+       if (tv->vval.v_string == NULL)
+           *tofree = string_quote(NULL, TRUE);
+       else
+           *tofree = string_quote(make_ufunc_name_readable(tv->vval.v_string,
+                                               buf, MAX_FUNC_NAME_LEN), TRUE);
        r = *tofree;
     }
 

diff --git a/src/version.c b/src/version.c
index 92088fc95f5e7a9022f8acaebf486f9c4069778b..8a1cab3f292c1ffc9e6f19544d43d92857277750 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    448,
 /**/
     447,
 /**/