From 7f3311b8755f144fea8ab56fa21816e7f92c5820 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 30 Jul 2021 09:45:55 +0200 Subject: -fix spelling --- src/util/configuration.c | 13 ++++++++----- src/util/gnunet-config.c | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/util') diff --git a/src/util/configuration.c b/src/util/configuration.c index 147f57a3c..e515c7c46 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -194,7 +194,7 @@ struct GNUNET_CONFIGURATION_Handle char *main_filename; /** - * When parsing into this configuration, and this vaue + * When parsing into this configuration, and this value * is non-NULL, only parse sections of the same name, * and ban import statements. */ @@ -616,7 +616,7 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg, { fun_ret = GNUNET_OK; } - cleanup: +cleanup: cfg->current_nest_level = old_nest_level; if (NULL != other_cfg) GNUNET_CONFIGURATION_destroy (other_cfg); @@ -779,7 +779,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, { LOG (GNUNET_ERROR_TYPE_WARNING, _ ( - "Illegal directive in line %u (parsing resticted section %s)\n"), + "Illegal directive in line %u (parsing restricted section %s)\n"), nr, cfg->restrict_section); ret = GNUNET_SYSERR; @@ -2300,7 +2300,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg, if (fun_ret != GNUNET_OK) break; } - cleanup: +cleanup: if (files_context.files_length > 0) { for (size_t i = 0; i < files_context.files_length; i++) @@ -2312,6 +2312,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg, return fun_ret; } + char * GNUNET_CONFIGURATION_default_filename (void) { @@ -2428,6 +2429,7 @@ GNUNET_CONFIGURATION_default (void) return cfg; } + /** * Load configuration (starts with defaults, then loads * system-specific configuration). @@ -2477,7 +2479,7 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, char *dname = GNUNET_STRINGS_filename_expand (baseconfig); GNUNET_free (baseconfig); - if ((GNUNET_YES == GNUNET_DISK_directory_test (dname, GNUNET_YES))&& + if ((GNUNET_YES == GNUNET_DISK_directory_test (dname, GNUNET_YES)) && (GNUNET_SYSERR == GNUNET_CONFIGURATION_load_from (cfg, dname))) { LOG (GNUNET_ERROR_TYPE_WARNING, @@ -2504,4 +2506,5 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, return GNUNET_OK; } + /* end of configuration.c */ diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index 4f16332db..807df0d74 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c @@ -193,7 +193,8 @@ run (void *cls, if ( (! rewrite) && (NULL == section) ) { - char *ser; + char *serialization; + if (! diagnostics) { fprintf (stderr, @@ -204,9 +205,11 @@ run (void *cls, global_ret = 1; return; } - ser = GNUNET_CONFIGURATION_serialize_diagnostics (cfg); - printf ("%s", ser); - GNUNET_free (ser); + serialization = GNUNET_CONFIGURATION_serialize_diagnostics (cfg); + fprintf (stdout, + "%s", + serialization); + GNUNET_free (serialization); } else if ( (NULL != section) && (NULL == value) ) -- cgit v1.2.3