diff options
Diffstat (limited to 'src/config.c')
-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 @@ -226,7 +226,7 @@ assert_string_arg (grecs_locus_t *locus, 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; @@ -282,7 +282,7 @@ cb_email_address (enum grecs_callback_command cmd, switch (value->type) { - case GCONF_TYPE_STRING: + case GRECS_TYPE_STRING: rc = mu_address_create (&addr, value->v.string); if (rc) { @@ -292,7 +292,7 @@ cb_email_address (enum grecs_callback_command cmd, } break; - case GCONF_TYPE_LIST: + case GRECS_TYPE_LIST: { const void *p; gl_list_iterator_t itr = gl_list_iterator (value->v.list); @@ -319,7 +319,7 @@ cb_email_address (enum grecs_callback_command cmd, } break; - case GCONF_TYPE_ARRAY: + case GRECS_TYPE_ARRAY: grecs_error (locus, 0, _("too many arguments")); return 1; } @@ -437,7 +437,7 @@ parse_single_statmask (grecs_locus_t *locus, const grecs_value_t *val, 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; @@ -483,11 +483,11 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask) 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; @@ -504,7 +504,7 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask) } break; - case GCONF_TYPE_LIST: + case GRECS_TYPE_LIST: { const void *p; gl_list_iterator_t itr = gl_list_iterator (val->v.list); @@ -600,7 +600,7 @@ cb_sql (enum grecs_callback_command cmd, 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; @@ -667,20 +667,20 @@ cb_define_message (enum grecs_callback_command cmd, 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; @@ -807,7 +807,7 @@ cb_archive (enum grecs_callback_command cmd, 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; @@ -986,7 +986,7 @@ cb_access_method_params (enum grecs_callback_command cmd, 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; @@ -1029,7 +1029,7 @@ static struct grecs_keyword access_method_kw[] = { { "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 } }; @@ -1075,7 +1075,7 @@ cb_access_method (enum grecs_callback_command cmd, 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; @@ -1154,7 +1154,7 @@ 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"), @@ -1192,7 +1192,7 @@ cb_spool (enum grecs_callback_command cmd, 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; @@ -1301,7 +1301,7 @@ cb_supp_groups (enum grecs_callback_command cmd, 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; @@ -1363,12 +1363,13 @@ cb_locking (enum grecs_callback_command cmd, { 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; } @@ -1390,7 +1391,7 @@ static struct grecs_keyword wydawca_kw[] = { { "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, @@ -1454,7 +1455,7 @@ static struct grecs_keyword wydawca_kw[] = { 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 } }; |