summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-09-07 06:09:40 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-09-07 06:09:40 (GMT)
commit25bb240e22f66276efc75a461c3261c999054b6f (patch) (unidiff)
treedbddf7a7ebaa557ddf38ee8e4ad79833a55b723c
parentfd8f55ffd25bfe4eed1524f3daba2f05f8dd373e (diff)
downloadmailfromd-25bb240e22f66276efc75a461c3261c999054b6f.tar.gz
mailfromd-25bb240e22f66276efc75a461c3261c999054b6f.tar.bz2
Minor fixesHEADmaster
* 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).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/main.c2
-rw-r--r--src/prog.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 7fe40db..4dddca2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -859,8 +859,6 @@ struct mu_cfg_param mf_cfg_param[] = {
859 N_("Read relayed domain names from the file"), 859 N_("Read relayed domain names from the file"),
860 N_("file: string") }, 860 N_("file: string") },
861 861
862 { "database", mu_cfg_section, NULL },
863
864 { "lock-retry-count", mu_cfg_callback, NULL, 0, 862 { "lock-retry-count", mu_cfg_callback, NULL, 0,
865 config_cb_lock_retry_count, 863 config_cb_lock_retry_count,
866 N_("Retry acquiring DBM file lock this number of times.") }, 864 N_("Retry acquiring DBM file lock this number of times.") },
diff --git a/src/prog.c b/src/prog.c
index 75b5228..e88c87c 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -494,7 +494,7 @@ static void
494env_register_auto(eval_environ_t env, void *ptr) 494env_register_auto(eval_environ_t env, void *ptr)
495{ 495{
496 char *addr = *(char**)ptr; 496 char *addr = *(char**)ptr;
497 497
498 if (env->numautos == MAX_AUTO_PTR) 498 if (env->numautos == MAX_AUTO_PTR)
499 runtime_error(env, "INTERNAL ERROR at %s:%d, please report", 499 runtime_error(env, "INTERNAL ERROR at %s:%d, please report",
500 __FILE__, __LINE__); 500 __FILE__, __LINE__);
@@ -660,10 +660,11 @@ runtime_warning(eval_environ_t env, const char *fmt, ...)
660 _("RUNTIME WARNING near %s:%u: "), 660 _("RUNTIME WARNING near %s:%u: "),
661 ENV_LOC_FILE(env), ENV_LOC_LINE(env)); 661 ENV_LOC_FILE(env), ENV_LOC_LINE(env));
662 va_start(ap, fmt); 662 va_start(ap, fmt);
663 mu_diag_output(MU_DIAG_WARNING, fmt, ap); 663 mu_diag_cont_printf(fmt, ap);
664 va_end(ap); 664 va_end(ap);
665 mu_diag_cont_printf("\n");
665} 666}
666 667
667void 668void
668runtime_error(eval_environ_t env, const char *fmt, ...) 669runtime_error(eval_environ_t env, const char *fmt, ...)
669{ 670{

Return to:

Send suggestions and report system problems to the System administrator.