aboutsummaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2018-03-15 13:29:52 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2018-03-15 14:12:23 +0200
commit58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2 (patch)
tree01fcd1416af582e2429f0ae8d120e2af39b8f9d9 /src/config.c
parent677473cdfc42b9fd83623902e80de946f108825c (diff)
downloadeclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.gz
eclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.bz2
Upgrade grecs
* grecs: pull * configure.ac: Enable json * lib/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@ (libeclat_a_SOURCES): Remove json sources. * src/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@ * tests/Makefile.am: Likewise. * lib/json.h: Remove. * lib/jsongrm.y: Remove. * lib/jsonlex.l: Remove. * tests/tjson.c: Remove. * src/config.c (eclat_kw): Mark statically initialized memory locations as such. * src/mktags.c (process_tags): Use wordsplit to process quoted arguments. * lib/bidimap.c (bidimap_config): Fill allocated memory with 0's * lib/filemap.c (filemap_config): Likewise. * lib/gdbmmap.c (gdbm_map_config): Likewise. * lib/seqmap.c (seqmap_config): Likewise.
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c
index 069ddd0..01379f3 100644
--- a/src/config.c
+++ b/src/config.c
@@ -380,13 +380,13 @@ static struct grecs_keyword instance_store_kw[] = {
static struct grecs_keyword eclat_kw[] = {
{ "default-endpoint", "hostname",
"Set default EC2 endpoint",
- grecs_type_string, GRECS_DFLT, &endpoint },
+ grecs_type_string, GRECS_CONST, &endpoint },
{ "region", "<name: string> <endpoint: string>",
"Define a region",
grecs_type_string, GRECS_MULT, NULL, 0, cb_region },
{ "signature-version", "version",
"Signature version",
- grecs_type_string, GRECS_DFLT, &signature_version },
+ grecs_type_string, GRECS_CONST, &signature_version },
{ "authentication-provider", "<type: file|instance-store> <arg: string>",
"Define authentication provider.",
grecs_type_string, GRECS_DFLT, NULL, 0, cb_authentication_provider },
@@ -468,7 +468,8 @@ config_init()
DEFAULT_INCLUDE_DIR, NULL);
grecs_preprocessor = DEFAULT_PREPROCESSOR;
grecs_log_to_stderr = 1;
- grecs_adjust_string_locations = 1;
+ grecs_parser_options = GRECS_OPTION_ADJUST_STRING_LOCATIONS
+ | GRECS_OPTION_QUOTED_STRING_CONCAT;
grecs_print_diag_fun = grecs_print_diag;
ec2_regtab = grecs_symtab_create_default(sizeof(struct ec2_param));

Return to:

Send suggestions and report system problems to the System administrator.