summaryrefslogtreecommitdiff
path: root/pop3d/pop3d.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-11-28 14:20:54 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-11-28 14:20:54 +0000
commita3a31df1d1c1606c5e20409289d1161bdcc5dfd9 (patch)
tree5a98d6bf0b90f004b445874d363fbd0246bbd849 /pop3d/pop3d.c
parent0c81afb7bef1b3c182dae633c73ec65694225aaf (diff)
downloadmailutils-a3a31df1d1c1606c5e20409289d1161bdcc5dfd9.tar.gz
mailutils-a3a31df1d1c1606c5e20409289d1161bdcc5dfd9.tar.bz2
* include/mailutils/cfg.h, mailbox/cfg_lexer.c,
mailbox/cfg_parser.y (mu_cfg_tree_t): New data type. (mu_cfg_perror_t): Remove (mu_cfg_parse): Change prototype. (mu_cfg_perror): Change type. (mu_cfg_format_error): New function. (mu_cfg_destroy_tree): Change signature. (mu_cfg_callback_t): Take mu_debug_t as its first argument, instead of mu_cfg_locus_t. The mu_debug_t is to be used for error reporting and debugging diagnostics. The cfg_lexer is responsible for storing the necessary locus data into it before calling callbacks. (mu_cfg_section_fp): Take an additional argument. (mu_cfg_scan_tree): Simplified prototype. The mu_cfg_tree_t passed as its first argument already contains all necessary data that were passed as arguments previously. (mu_parse_config): First two args are consts. * include/mailutils/libcfg.h, imap4d/imap4d.c, libcfg/auth.c, libcfg/common.c, libcfg/ldap.c, libcfg/sieve.c, libcfg/sql.c, maidag/maidag.c, mail.local/main.c, mimeview/mimeview.c, pop3d/pop3d.c, sieve/sieve.c: Reflect changes to the cfg framework. * mailbox/debug.c (mu_debug_vprintf): Make sure the locus info is formatted on the first call.
Diffstat (limited to 'pop3d/pop3d.c')
-rw-r--r--pop3d/pop3d.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index fbf4c6208..09b7bd15b 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -112,7 +112,7 @@ static struct argp_option options[] = {
#ifdef WITH_TLS
static int
-cb_tls_expired (mu_cfg_locus_t *locus, void *data, char *arg)
+cb_tls_required (mu_debug_t debug, void *data, char *arg)
{
initial_state = INITIAL;
return 0;
@@ -120,16 +120,16 @@ cb_tls_expired (mu_cfg_locus_t *locus, void *data, char *arg)
#endif
static int
-cb_bulletin_source (mu_cfg_locus_t *locus, void *data, char *arg)
+cb_bulletin_source (mu_debug_t debug, void *data, char *arg)
{
- set_bulletin_source (arg);
+ set_bulletin_source (arg); /* FIXME: Error reporting? */
return 0;
}
static int
-cb_bulletin_db (mu_cfg_locus_t *locus, void *data, char *arg)
+cb_bulletin_db (mu_debug_t debug, void *data, char *arg)
{
- set_bulletin_db (arg);
+ set_bulletin_db (arg); /* FIXME: Error reporting? */
return 0;
}
@@ -138,7 +138,7 @@ static struct mu_cfg_param pop3d_cfg_param[] = {
{ "expire", mu_cfg_time, &expire },
{ "delete-expired", mu_cfg_int, &expire_on_exit },
#ifdef WITH_TLS
- { "tls-required", mu_cfg_callback, NULL, cb_tls_expired },
+ { "tls-required", mu_cfg_callback, NULL, cb_tls_required },
#endif
#ifdef ENABLE_LOGIN_DELAY
{ "login-delay", mu_cfg_time, &login_delay },

Return to:

Send suggestions and report system problems to the System administrator.