IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2443 from jszakmeister/fix-more-release-warnings

Browse Source 
Fix a few uninitialized variable warnings.
This commit is contained in:
John Szakmeister 2015-04-18 16:52:43 -04:00
commit 6395048946
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/eval.c
View File

@ -19085,15 +19085,26 @@ call_user_func (
--no_wait_return; --no_wait_return;
} }
} }
bool func_not_yet_profiling_but_should =
do_profiling == PROF_YES
&& !fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL);
if (func_not_yet_profiling_but_should)
func_do_profile(fp);
bool func_or_func_caller_profiling =
do_profiling == PROF_YES
&& (fp->uf_profiling
|| (fc->caller != NULL && fc->caller->func->uf_profiling));
if (func_or_func_caller_profiling) {
++fp->uf_tm_count;
call_start = profile_start();
fp->uf_tm_children = profile_zero();
}
if (do_profiling == PROF_YES) { if (do_profiling == PROF_YES) {
if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
func_do_profile(fp);
if (fp->uf_profiling
|| (fc->caller != NULL && fc->caller->func->uf_profiling)) {
++fp->uf_tm_count;
call_start = profile_start();
fp->uf_tm_children = profile_zero();
}
script_prof_save(&wait_start); script_prof_save(&wait_start);
} }
@ -19116,9 +19127,7 @@ call_user_func (
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
} }
if (do_profiling == PROF_YES && (fp->uf_profiling if (func_or_func_caller_profiling) {
|| (fc->caller != NULL &&
fc->caller->func->uf_profiling))) {
call_start = profile_end(call_start); call_start = profile_end(call_start);
call_start = profile_sub_wait(wait_start, call_start); call_start = profile_sub_wait(wait_start, call_start);
fp->uf_tm_total = profile_add(fp->uf_tm_total, call_start); fp->uf_tm_total = profile_add(fp->uf_tm_total, call_start);

2
src/nvim/hardcopy.c
View File

@ -2130,7 +2130,7 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
} }
/* Use first encoding matched if no charset matched */ /* Use first encoding matched if no charset matched */
if (p_mbchar == NULL && p_mbenc_first != NULL) { if (p_mbenc_first != NULL && p_mbchar == NULL) {
p_mbenc = p_mbenc_first; p_mbenc = p_mbenc_first;
cmap = effective_cmap; cmap = effective_cmap;
} }

2
src/nvim/msgpack_rpc/server.c
View File

@ -238,7 +238,7 @@ void server_stop(char *endpoint)
} }
} }
if (i == servers.ga_len) { if (i >= servers.ga_len) {
ELOG("Not listening on %s", addr); ELOG("Not listening on %s", addr);
return; return;
} }