diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-27 00:57:28 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-27 00:57:28 +0200 |
commit | 10bfdead36174d0190645fb373828bfb7ba37836 (patch) | |
tree | 8db262071cec7538cd5e3eddfe59a4d05aad1fb1 /src | |
parent | 1156d6d18fc7b22e51b220f02a949d32ede5ed20 (diff) | |
download | wydawca-10bfdead36174d0190645fb373828bfb7ba37836.tar.gz wydawca-10bfdead36174d0190645fb373828bfb7ba37836.tar.bz2 |
Switch to grecs master.
* grecs: Switch to master.
* src/config.c: Upgrade (rename GCONF_* to GRECS_*)
Diffstat (limited to 'src')
-rw-r--r-- | src/config.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/config.c b/src/config.c index 674e1c3..8758802 100644 --- a/src/config.c +++ b/src/config.c @@ -223,13 +223,13 @@ assert_string_arg (grecs_locus_t *locus, { if (cmd != grecs_callback_set_value) { grecs_error (locus, 0, _("Unexpected block statement")); return 1; } - if (!value || value->type != GCONF_TYPE_STRING) + if (!value || value->type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("expected scalar value as a tag")); return 1; } return 0; } @@ -279,23 +279,23 @@ cb_email_address (enum grecs_callback_command cmd, { int rc; mu_address_t addr = NULL; switch (value->type) { - case GCONF_TYPE_STRING: + case GRECS_TYPE_STRING: rc = mu_address_create (&addr, value->v.string); if (rc) { grecs_error (locus, 0, _("%s: invalid email address: %s"), value->v.string, mu_strerror (rc)); return rc; } break; - case GCONF_TYPE_LIST: + case GRECS_TYPE_LIST: { const void *p; gl_list_iterator_t itr = gl_list_iterator (value->v.list); while (gl_list_iterator_next (&itr, &p, NULL)) { @@ -316,13 +316,13 @@ cb_email_address (enum grecs_callback_command cmd, if (rc) break; } } break; - case GCONF_TYPE_ARRAY: + case GRECS_TYPE_ARRAY: grecs_error (locus, 0, _("too many arguments")); return 1; } *(mu_address_t*) varptr = addr; return rc; @@ -434,13 +434,13 @@ static int parse_single_statmask (grecs_locus_t *locus, const grecs_value_t *val, unsigned long *pmask, int *invert) { const char *arg; ptrdiff_t x; - if (val->type != GCONF_TYPE_STRING) + if (val->type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("expected scalar value but found list")); return 1; } arg = val->v.string; @@ -480,17 +480,17 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask) int err = 0; int invert = 0; unsigned long mask = 0; switch (val->type) { - case GCONF_TYPE_STRING: + case GRECS_TYPE_STRING: err = parse_single_statmask (loc, val, &mask, &invert); break; - case GCONF_TYPE_ARRAY: + case GRECS_TYPE_ARRAY: { int i; for (i = 0; i < val->v.arg.c; i++) { unsigned long x; @@ -501,13 +501,13 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask) else mask |= x; } } break; - case GCONF_TYPE_LIST: + case GRECS_TYPE_LIST: { const void *p; gl_list_iterator_t itr = gl_list_iterator (val->v.list); while (gl_list_iterator_next (&itr, &p, NULL)) { @@ -597,13 +597,13 @@ cb_sql (enum grecs_callback_command cmd, { struct sqlconn *pconn; void **pdata = cb_data; switch (cmd) { case grecs_callback_section_begin: - if (!value || value->type != GCONF_TYPE_STRING) + if (!value || value->type != GRECS_TYPE_STRING) { grecs_error(locus, 0, _("tag must be a string")); return 0; } pconn = xzalloc (sizeof (*pconn)); pconn->ident = strdup (value->v.string); @@ -664,26 +664,26 @@ cb_define_message (enum grecs_callback_command cmd, if (cmd != grecs_callback_set_value) { grecs_error (locus, 0, _("Unexpected block statement")); return 1; } - if (!value || value->type != GCONF_TYPE_ARRAY || value->v.arg.c != 2) + if (!value || value->type != GRECS_TYPE_ARRAY || value->v.arg.c != 2) { grecs_error (locus, 0, _("expected two arguments")); return 1; } - if (value->v.arg.v[0].type != GCONF_TYPE_STRING) + if (value->v.arg.v[0].type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("first argument not a string")); return 1; } ident = value->v.arg.v[0].v.string; - if (value->v.arg.v[1].type != GCONF_TYPE_STRING) + if (value->v.arg.v[1].type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("second argument not a string")); return 1; } register_message_template (ident, value->v.arg.v[1].v.string); @@ -804,13 +804,13 @@ cb_archive (enum grecs_callback_command cmd, if (!value) { grecs_error (locus, 0, _("expected tag")); return 1; } - if (value->type != GCONF_TYPE_STRING) + if (value->type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("expected scalar value but found list")); return 1; } if (strcmp (value->v.string, "none") == 0) @@ -983,13 +983,13 @@ cb_access_method_params (enum grecs_callback_command cmd, if (cmd != grecs_callback_set_value) { grecs_error (locus, 0, _("Unexpected block statement")); return 1; } - if (!value || value->type != GCONF_TYPE_LIST) + if (!value || value->type != GRECS_TYPE_LIST) { grecs_error (locus, 0, _("expected list value")); return 1; } size = gl_list_size (value->v.list); @@ -1026,13 +1026,13 @@ static struct grecs_keyword access_method_kw[] = { { "type", N_("type"), N_("Method type"), grecs_type_string, NULL, offsetof(struct access_method, type), cb_access_method_type }, { "query", N_("string"), N_("Query template"), grecs_type_string, NULL, offsetof(struct access_method, query) }, { "params", N_("arg"), N_("Set method parameters"), - grecs_type_string|GCONF_LIST, NULL, 0, + grecs_type_string|GRECS_LIST, NULL, 0, cb_access_method_params }, { NULL } }; int string_to_access_method_id (grecs_locus_t *locus, @@ -1072,13 +1072,13 @@ cb_access_method (enum grecs_callback_command cmd, struct access_method **pmeth, *meth; void **pdata = cb_data; enum access_method_id id; switch (cmd) { case grecs_callback_section_begin: - if (!value || value->type != GCONF_TYPE_STRING) + if (!value || value->type != GRECS_TYPE_STRING) { grecs_error(locus, 0, _("tag must be a string")); return 0; } if (string_to_access_method_id (locus, value->v.string, &id)) return 1; @@ -1151,13 +1151,13 @@ cb_url (enum grecs_callback_command cmd, static struct grecs_keyword spool_kw[] = { { "url", N_("arg"), N_("URL corresponding to this spool"), grecs_type_string, NULL, offsetof(struct spool, url) }, { "alias", N_("arg"), N_("Aliases"), - grecs_type_string|GCONF_LIST, NULL, offsetof(struct spool, aliases) }, + grecs_type_string|GRECS_LIST, NULL, offsetof(struct spool, aliases) }, { "source", N_("dir"), N_("Source directory"), grecs_type_string, NULL, offsetof(struct spool, source_dir) }, { "destination", N_("dir"), N_("Destination directory"), grecs_type_string, NULL, offsetof(struct spool, dest_url), cb_url }, { "file-sweep-time", N_("interval"), N_("Define file sweep time"), @@ -1189,13 +1189,13 @@ cb_spool (enum grecs_callback_command cmd, void **pdata = cb_data; int rc, ec, i; switch (cmd) { case grecs_callback_section_begin: - if (!value || value->type != GCONF_TYPE_STRING) + if (!value || value->type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("tag must be a string")); return 1; } spool = xzalloc (sizeof (*spool)); spool->tag = xstrdup (value->v.string); @@ -1298,13 +1298,13 @@ cb_supp_groups (enum grecs_callback_command cmd, { if (cmd != grecs_callback_set_value) { grecs_error (locus, 0, _("Unexpected block statement")); return 1; } - if (!value || value->type != GCONF_TYPE_LIST) + if (!value || value->type != GRECS_TYPE_LIST) { grecs_error (locus, 0, _("expected list value")); return 1; } wydawca_supp_groupc = gl_list_size (value->v.list); @@ -1360,18 +1360,19 @@ cb_locking (enum grecs_callback_command cmd, void *varptr, grecs_value_t *value, void *cb_data) { if (cmd == grecs_callback_set_value) { - if (!value || value->type != GCONF_TYPE_STRING) + if (!value || value->type != GRECS_TYPE_STRING) { grecs_error (locus, 0, _("expected scalar value as a tag")); return 1; } - grecs_string_convert (&enable_locking, grecs_type_bool, value->v.string); + grecs_string_convert (&enable_locking, grecs_type_bool, value->v.string, + locus); } return 0; } @@ -1387,13 +1388,13 @@ static struct grecs_keyword wydawca_kw[] = { { "pidfile", N_("file"), N_("Set pid file name"), grecs_type_string, &pidfile }, { "user", N_("name"), N_("Run with UID and GID of this user"), grecs_type_string, NULL, 0, cb_user }, { "group", NULL, N_("Retain these supplementary groups"), - grecs_type_string|GCONF_LIST, NULL, 0, cb_supp_groups }, + grecs_type_string|GRECS_LIST, NULL, 0, cb_supp_groups }, { "locking", NULL, N_("Configure locking"), grecs_type_section, NULL, 0, cb_locking, NULL, locking_kw }, { "listen", N_("socket"), N_("Listen on this address"), @@ -1451,13 +1452,13 @@ static struct grecs_keyword wydawca_kw[] = { { "spool", N_("tag: string"), N_("Define distribution spool"), grecs_type_section, NULL, 0, cb_spool, NULL, spool_kw }, { "all-spools", NULL, N_("Service names that request scanning all spools"), - grecs_type_string|GCONF_LIST, &all_spool_aliases }, + grecs_type_string|GRECS_LIST, &all_spool_aliases }, { NULL } }; void config_help () |