diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2024-05-29 07:51:50 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-05-29 07:51:50 +0200 |
| commit | 8904d672befb496cf224f01bc042683bb6120e81 (patch) | |
| tree | f0c01a2901c493f91ea017baeb6600ad8ee931c7 | |
| parent | 0b74eeceb856e7a4c2823f5b6c2c2ee95a72331c (diff) | |
patch 9.1.0448: compiler warning in eval.cv9.1.0448
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>
| -rw-r--r-- | src/eval.c | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 21 insertions, 10 deletions
diff --git a/src/eval.c b/src/eval.c index 8583610734..b08f296576 100644 --- 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 92088fc95f..8a1cab3f29 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 448, +/**/ 447, /**/ 446, |