From 25bb240e22f66276efc75a461c3261c999054b6f Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 7 Sep 2019 09:09:40 +0300 Subject: Minor fixes * src/main.c (mf_cfg_param): Remove the surplus "database" section: it is already included in srvcfg.c * src/prog.c (env_register_auto): Use mu_diag_cont_printf to continue diagnostic message without inserting unnecessary <> directives (perhaps should be fixed in mailutils). --- src/main.c | 2 -- src/prog.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index 7fe40dbc..4dddca29 100644 --- a/src/main.c +++ b/src/main.c @@ -859,8 +859,6 @@ struct mu_cfg_param mf_cfg_param[] = { N_("Read relayed domain names from the file"), N_("file: string") }, - { "database", mu_cfg_section, NULL }, - { "lock-retry-count", mu_cfg_callback, NULL, 0, config_cb_lock_retry_count, N_("Retry acquiring DBM file lock this number of times.") }, diff --git a/src/prog.c b/src/prog.c index 75b52284..e88c87c7 100644 --- a/src/prog.c +++ b/src/prog.c @@ -494,7 +494,7 @@ static void env_register_auto(eval_environ_t env, void *ptr) { char *addr = *(char**)ptr; - + if (env->numautos == MAX_AUTO_PTR) runtime_error(env, "INTERNAL ERROR at %s:%d, please report", __FILE__, __LINE__); @@ -660,10 +660,11 @@ runtime_warning(eval_environ_t env, const char *fmt, ...) _("RUNTIME WARNING near %s:%u: "), ENV_LOC_FILE(env), ENV_LOC_LINE(env)); va_start(ap, fmt); - mu_diag_output(MU_DIAG_WARNING, fmt, ap); + mu_diag_cont_printf(fmt, ap); va_end(ap); + mu_diag_cont_printf("\n"); } - + void runtime_error(eval_environ_t env, const char *fmt, ...) { -- cgit v1.2.1