eval.c: Code style fixes

This commit is contained in:
Jurica Bradaric
2017-04-15 18:45:47 +02:00
parent a8f7872f44
commit ec0fabd4d5

View File

@@ -16696,12 +16696,12 @@ static void f_timer_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (argvars[0].v_type != VAR_UNKNOWN) { if (argvars[0].v_type != VAR_UNKNOWN) {
if (argvars[0].v_type != VAR_NUMBER) { if (argvars[0].v_type != VAR_NUMBER) {
EMSG(_(e_number_exp)); EMSG(_(e_number_exp));
} else { return;
}
timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0])); timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
if (timer != NULL && !timer->stopped) { if (timer != NULL && !timer->stopped) {
add_timer_info(rettv, timer); add_timer_info(rettv, timer);
} }
}
} else { } else {
add_timer_info_all(rettv); add_timer_info_all(rettv);
} }
@@ -16712,14 +16712,14 @@ static void f_timer_pause(typval_T *argvars, typval_T *unused, FunPtr fptr)
{ {
if (argvars[0].v_type != VAR_NUMBER) { if (argvars[0].v_type != VAR_NUMBER) {
EMSG(_(e_number_exp)); EMSG(_(e_number_exp));
} else { return;
}
int paused = (bool)tv_get_number(&argvars[1]); int paused = (bool)tv_get_number(&argvars[1]);
timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0])); timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
if (timer != NULL) { if (timer != NULL) {
timer->paused = paused; timer->paused = paused;
} }
} }
}
/// "timer_start(timeout, callback, opts)" function /// "timer_start(timeout, callback, opts)" function
static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
@@ -16790,7 +16790,7 @@ static void f_timer_stop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void f_timer_stopall(typval_T *argvars, typval_T *unused, FunPtr fptr) static void f_timer_stopall(typval_T *argvars, typval_T *unused, FunPtr fptr)
{ {
timer_teardown(); timer_stop_all();
} }
// invoked on the main loop // invoked on the main loop
@@ -16853,7 +16853,7 @@ static void timer_decref(timer_T *timer)
} }
} }
void timer_teardown(void) static void timer_stop_all(void)
{ {
timer_T *timer; timer_T *timer;
map_foreach_value(timers, timer, { map_foreach_value(timers, timer, {
@@ -16861,6 +16861,11 @@ void timer_teardown(void)
}) })
} }
void timer_teardown(void)
{
timer_stop_all();
}
/* /*
* "tolower(string)" function * "tolower(string)" function
*/ */