summaryrefslogtreecommitdiff
path: root/comsat
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2016-10-08 16:21:23 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2016-10-08 16:21:23 +0300
commitaac8beae014b6345bc3682c6d0f5b544b2a84956 (patch)
tree4c7d2c798cc468d2eb4c8cb8d8209cba3d233274 /comsat
parent87ef8884693eb0cdcdafa2365c86709f33e3a375 (diff)
downloadmailutils-aac8beae014b6345bc3682c6d0f5b544b2a84956.tar.gz
mailutils-aac8beae014b6345bc3682c6d0f5b544b2a84956.tar.bz2
Use mu_c_type_t throughout the code. Get rid of mu_cfg_param_data_type.
* include/mailutils/cfg.h (mu_cfg_param_data_type): Remove. (mu_cfg_param_type): New enum. (mu_cfg_param) <type>: Change type to int. (mu_cfg_cidr): Remove. (mu_cfg_parse_boolean): Remove. All uses updated. * include/mailutils/util.h (mu_c_void): New constant. (mu_c_type_str): New extern/ * libmailutils/string/str_to_c.c (mu_c_type_str): New global. * libmailutils/cfg/format.c (mu_cfg_data_type_string): Rename to mu_c_type_string; change argument type. All uses updated. * libmailutils/cfg/parser.y: Use mu_str_to_c for value conversion. * libmailutils/tests/.gitignore: Update. * libmailutils/tests/Makefile.am: Add strtoc.at; build strtoc * libmailutils/tests/strtoc.at: New file. * libmailutils/tests/strtoc.c: New file. * libmailutils/tests/testsuite.at: Include strtoc.at * comsat/comsat.c: Use mu_c_type_t types. * dotlock/dotlock.c: Likewise. * imap4d/imap4d.c: Likewise. * lib/manlock.c: Likewise. * lib/tcpwrap.c: Likewise. * libmailutils/server/msrv.c: Likewise. * libmu_argp/muinit.c: Likewise. * libmu_cfg/common.c: Likewise. * libmu_cfg/gsasl.c: Likewise. * libmu_cfg/ldap.c: Likewise. * libmu_cfg/pam.c: Likewise. * libmu_cfg/radius.c: Likewise. * libmu_cfg/sieve.c: Likewise. * libmu_cfg/sql.c: Likewise. * libmu_cfg/tls.c: Likewise. * libmu_cfg/virtdomain.c: Likewise. * maidag/maidag.c: Likewise. * mimeview/mimeview.c: Likewise. * movemail/movemail.c: Likewise. * pop3d/pop3d.c: Likewise. * readmsg/readmsg.c: Likewise. * sieve/sieve.c: Likewise.
Diffstat (limited to 'comsat')
-rw-r--r--comsat/comsat.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/comsat/comsat.c b/comsat/comsat.c
index 48add9af7..0911a3729 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -128,7 +128,7 @@ biffrc_error_ctl (mu_config_value_t *val, int flag)
if (mu_cfg_assert_value_type (val, MU_CFG_STRING))
return 1;
- if (mu_cfg_parse_boolean (val->v.string, &res))
+ if (mu_str_to_c (val->v.string, mu_c_bool, &res, NULL))
mu_diag_output (MU_LOG_ERROR, _("not a boolean"));
else if (res)
biffrc_errors |= flag;
@@ -150,9 +150,9 @@ cb_biffrc_errors_to_err (void *data, mu_config_value_t *val)
}
struct mu_cfg_param comsat_cfg_param[] = {
- { "allow-biffrc", mu_cfg_bool, &allow_biffrc, 0, NULL,
+ { "allow-biffrc", mu_c_bool, &allow_biffrc, 0, NULL,
N_("Read .biffrc file from the user home directory.") },
- { "require-tty", mu_cfg_bool, &require_tty, 0, NULL,
+ { "require-tty", mu_c_bool, &require_tty, 0, NULL,
N_("Notify only if the user is logged on one of the ttys.") },
{ "biffrc-errors-to-tty", mu_cfg_callback, NULL, 0, cb_biffrc_errors_to_tty,
N_("Send biffrc errors to user's tty."),
@@ -160,17 +160,17 @@ struct mu_cfg_param comsat_cfg_param[] = {
{ "biffrc-errors-to-err", mu_cfg_callback, NULL, 0, cb_biffrc_errors_to_err,
N_("Send biffrc errors to Mailutils error output."),
N_("arg: bool") },
- { "max-lines", mu_cfg_int, &maxlines, 0, NULL,
+ { "max-lines", mu_c_int, &maxlines, 0, NULL,
N_("Maximum number of message body lines to be output.") },
- { "max-requests", mu_cfg_uint, &maxrequests, 0, NULL,
+ { "max-requests", mu_c_uint, &maxrequests, 0, NULL,
N_("Maximum number of incoming requests per request control interval.") },
- { "request-control-interval", mu_cfg_time, &request_control_interval,
+ { "request-control-interval", mu_c_time, &request_control_interval,
0, NULL,
N_("Set control interval.") },
- { "overflow-control-interval", mu_cfg_time, &overflow_control_interval,
+ { "overflow-control-interval", mu_c_time, &overflow_control_interval,
0, NULL,
N_("Set overflow control interval.") },
- { "overflow-delay-time", mu_cfg_time, &overflow_delay_time,
+ { "overflow-delay-time", mu_c_time, &overflow_delay_time,
0, NULL,
N_("Time to sleep after the first overflow occurs.") },
{ ".server", mu_cfg_section, NULL, 0, NULL,

Return to:

Send suggestions and report system problems to the System administrator.