eval.c: remove nonnullret deadcode

The following calls can't return null:
* xmalloc
* xcalloc
* get_buffer_info
* get_tabpage_info
* get_vim_var_str
* get_win_info
* tv_get_string
* tv_list_alloc
* tv_list_alloc_ret
* vim_strnsave
This commit is contained in:
Peter Kalauskas 2017-11-21 10:36:06 -08:00
parent c030a38168
commit 1b94f24d6e

View File

@ -2206,10 +2206,6 @@ static char_u *get_lval(char_u *const name, typval_T *const rettv,
if (len == -1) { if (len == -1) {
// "[key]": get key from "var1" // "[key]": get key from "var1"
key = (char_u *)tv_get_string(&var1); // is number or string key = (char_u *)tv_get_string(&var1); // is number or string
if (key == NULL) {
tv_clear(&var1);
return NULL;
}
} }
lp->ll_list = NULL; lp->ll_list = NULL;
lp->ll_dict = lp->ll_tv->vval.v_dict; lp->ll_dict = lp->ll_tv->vval.v_dict;
@ -5706,10 +5702,6 @@ static int get_function_args(char_u **argp, char_u endchar, garray_T *newargs,
c = *p; c = *p;
*p = NUL; *p = NUL;
arg = vim_strsave(arg); arg = vim_strsave(arg);
if (arg == NULL) {
*p = c;
goto err_ret;
}
// Check for duplicate argument name. // Check for duplicate argument name.
for (i = 0; i < newargs->ga_len; i++) { for (i = 0; i < newargs->ga_len; i++) {
@ -5833,10 +5825,6 @@ static int get_lambda_tv(char_u **arg, typval_T *rettv, bool evaluate)
fp = (ufunc_T *)xcalloc(1, sizeof(ufunc_T) + STRLEN(name)); fp = (ufunc_T *)xcalloc(1, sizeof(ufunc_T) + STRLEN(name));
pt = (partial_T *)xcalloc(1, sizeof(partial_T)); pt = (partial_T *)xcalloc(1, sizeof(partial_T));
if (pt == NULL) {
xfree(fp);
goto errret;
}
ga_init(&newlines, (int)sizeof(char_u *), 1); ga_init(&newlines, (int)sizeof(char_u *), 1);
ga_grow(&newlines, 1); ga_grow(&newlines, 1);
@ -6222,14 +6210,10 @@ static char_u *fname_trans_sid(const char_u *const name,
fname = fname_buf; fname = fname_buf;
} else { } else {
fname = xmalloc(i + STRLEN(name + llen) + 1); fname = xmalloc(i + STRLEN(name + llen) + 1);
if (fname == NULL) {
*error = ERROR_OTHER;
} else {
*tofree = fname; *tofree = fname;
memmove(fname, fname_buf, (size_t)i); memmove(fname, fname_buf, (size_t)i);
STRCPY(fname + i, name + llen); STRCPY(fname + i, name + llen);
} }
}
} else { } else {
fname = (char_u *)name; fname = (char_u *)name;
} }
@ -6309,9 +6293,6 @@ call_func(
// Make a copy of the name, if it comes from a funcref variable it could // Make a copy of the name, if it comes from a funcref variable it could
// be changed or deleted in the called function. // be changed or deleted in the called function.
name = vim_strnsave(funcname, len); name = vim_strnsave(funcname, len);
if (name == NULL) {
return ret;
}
fname = fname_trans_sid(name, fname_buf, &tofree, &error); fname = fname_trans_sid(name, fname_buf, &tofree, &error);
@ -7184,8 +7165,7 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
&& argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_UNKNOWN
&& tv_get_number_chk(&argvars[1], &error) != 0 && tv_get_number_chk(&argvars[1], &error) != 0
&& !error && !error
&& (name = tv_get_string_chk(&argvars[0])) != NULL && (name = tv_get_string_chk(&argvars[0])) != NULL) {
&& !error) {
buf = buflist_new((char_u *)name, NULL, 1, 0); buf = buflist_new((char_u *)name, NULL, 1, 0);
} }
@ -7733,7 +7713,7 @@ static void f_delete(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
const char *const name = tv_get_string(&argvars[0]); const char *const name = tv_get_string(&argvars[0]);
if (name == NULL || *name == NUL) { if (*name == NUL) {
EMSG(_(e_invarg)); EMSG(_(e_invarg));
return; return;
} }
@ -8748,8 +8728,7 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
foldstart = (linenr_T)get_vim_var_nr(VV_FOLDSTART); foldstart = (linenr_T)get_vim_var_nr(VV_FOLDSTART);
foldend = (linenr_T)get_vim_var_nr(VV_FOLDEND); foldend = (linenr_T)get_vim_var_nr(VV_FOLDEND);
dashes = get_vim_var_str(VV_FOLDDASHES); dashes = get_vim_var_str(VV_FOLDDASHES);
if (foldstart > 0 && foldend <= curbuf->b_ml.ml_line_count if (foldstart > 0 && foldend <= curbuf->b_ml.ml_line_count) {
&& dashes != NULL) {
/* Find first non-empty line in the fold. */ /* Find first non-empty line in the fold. */
for (lnum = foldstart; lnum < foldend; ++lnum) { for (lnum = foldstart; lnum < foldend; ++lnum) {
if (!linewhite(lnum)) { if (!linewhite(lnum)) {
@ -8874,10 +8853,8 @@ static void common_function(typval_T *argvars, typval_T *rettv,
snprintf(sid_buf, sizeof(sid_buf), "<SNR>%" PRId64 "_", snprintf(sid_buf, sizeof(sid_buf), "<SNR>%" PRId64 "_",
(int64_t)current_SID); (int64_t)current_SID);
name = xmalloc(STRLEN(sid_buf) + STRLEN(s + off) + 1); name = xmalloc(STRLEN(sid_buf) + STRLEN(s + off) + 1);
if (name != NULL) {
STRCPY(name, sid_buf); STRCPY(name, sid_buf);
STRCAT(name, s + off); STRCAT(name, s + off);
}
} else { } else {
name = vim_strsave(s); name = vim_strsave(s);
} }
@ -8927,11 +8904,6 @@ static void common_function(typval_T *argvars, typval_T *rettv,
pt->pt_argc = arg_len + lv_len; pt->pt_argc = arg_len + lv_len;
pt->pt_argv = xmalloc(sizeof(pt->pt_argv[0]) * pt->pt_argc); pt->pt_argv = xmalloc(sizeof(pt->pt_argv[0]) * pt->pt_argc);
if (pt->pt_argv == NULL) {
xfree(pt);
xfree(name);
goto theend;
}
int i = 0; int i = 0;
for (; i < arg_len; i++) { for (; i < arg_len; i++) {
tv_copy(&arg_pt->pt_argv[i], &pt->pt_argv[i]); tv_copy(&arg_pt->pt_argv[i], &pt->pt_argv[i]);
@ -9197,9 +9169,7 @@ static void f_getbufinfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
dict_T *const d = get_buffer_info(buf); dict_T *const d = get_buffer_info(buf);
if (d != NULL) {
tv_list_append_dict(rettv->vval.v_list, d); tv_list_append_dict(rettv->vval.v_list, d);
}
if (argbuf != NULL) { if (argbuf != NULL) {
return; return;
} }
@ -9568,14 +9538,12 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
theend: theend:
pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context); pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
tv_list_alloc_ret(rettv); tv_list_alloc_ret(rettv);
if (pat != NULL) {
ExpandOne(&xpc, pat, NULL, options, WILD_ALL_KEEP); ExpandOne(&xpc, pat, NULL, options, WILD_ALL_KEEP);
for (int i = 0; i < xpc.xp_numfiles; i++) { for (int i = 0; i < xpc.xp_numfiles; i++) {
tv_list_append_string(rettv->vval.v_list, (const char *)xpc.xp_files[i], tv_list_append_string(rettv->vval.v_list, (const char *)xpc.xp_files[i],
-1); -1);
} }
}
xfree(pat); xfree(pat);
ExpandCleanup(&xpc); ExpandCleanup(&xpc);
} }
@ -10136,9 +10104,7 @@ static void f_gettabinfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
continue; continue;
} }
dict_T *const d = get_tabpage_info(tp, tpnr); dict_T *const d = get_tabpage_info(tp, tpnr);
if (d != NULL) {
tv_list_append_dict(rettv->vval.v_list, d); tv_list_append_dict(rettv->vval.v_list, d);
}
if (tparg != NULL) { if (tparg != NULL) {
return; return;
} }
@ -10240,9 +10206,7 @@ static void f_getwininfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
winnr++; winnr++;
dict_T *const d = get_win_info(wp, tabnr, winnr); dict_T *const d = get_win_info(wp, tabnr, winnr);
if (d != NULL) {
tv_list_append_dict(rettv->vval.v_list, d); tv_list_append_dict(rettv->vval.v_list, d);
}
if (wparg != NULL) { if (wparg != NULL) {
// found information about a specific window // found information about a specific window
return; return;
@ -14803,9 +14767,6 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (di == NULL) { if (di == NULL) {
if (s == NULL) { if (s == NULL) {
s = tv_list_alloc(); s = tv_list_alloc();
if (s == NULL) {
return;
}
} }
// match from matchaddpos() // match from matchaddpos()
@ -18628,8 +18589,6 @@ void set_selfdict(typval_T *rettv, dict_T *selfdict)
// Turn "dict.Func" into a partial for "Func" with "dict". // Turn "dict.Func" into a partial for "Func" with "dict".
if (fp != NULL && (fp->uf_flags & FC_DICT)) { if (fp != NULL && (fp->uf_flags & FC_DICT)) {
partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T)); partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
if (pt != NULL) {
pt->pt_refcount = 1; pt->pt_refcount = 1;
pt->pt_dict = selfdict; pt->pt_dict = selfdict;
(selfdict->dv_refcount)++; (selfdict->dv_refcount)++;
@ -18654,22 +18613,16 @@ void set_selfdict(typval_T *rettv, dict_T *selfdict)
if (ret_pt->pt_argc > 0) { if (ret_pt->pt_argc > 0) {
size_t arg_size = sizeof(typval_T) * ret_pt->pt_argc; size_t arg_size = sizeof(typval_T) * ret_pt->pt_argc;
pt->pt_argv = (typval_T *)xmalloc(arg_size); pt->pt_argv = (typval_T *)xmalloc(arg_size);
if (pt->pt_argv == NULL) {
// out of memory: drop the arguments
pt->pt_argc = 0;
} else {
pt->pt_argc = ret_pt->pt_argc; pt->pt_argc = ret_pt->pt_argc;
for (i = 0; i < pt->pt_argc; i++) { for (i = 0; i < pt->pt_argc; i++) {
tv_copy(&ret_pt->pt_argv[i], &pt->pt_argv[i]); tv_copy(&ret_pt->pt_argv[i], &pt->pt_argv[i]);
} }
} }
}
partial_unref(ret_pt); partial_unref(ret_pt);
} }
rettv->v_type = VAR_PARTIAL; rettv->v_type = VAR_PARTIAL;
rettv->vval.v_partial = pt; rettv->vval.v_partial = pt;
} }
}
} }
// Find variable "name" in the list of variables. // Find variable "name" in the list of variables.