aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-07-30 09:45:55 +0200
committerChristian Grothoff <christian@grothoff.org>2021-07-30 09:45:55 +0200
commit7f3311b8755f144fea8ab56fa21816e7f92c5820 (patch)
tree0dc303e081269a7c441079a28bbc4accfc7762d4 /src/util
parent5d50fd641c798fab78267446fe527ffbc7c06949 (diff)
downloadgnunet-7f3311b8755f144fea8ab56fa21816e7f92c5820.tar.gz
gnunet-7f3311b8755f144fea8ab56fa21816e7f92c5820.zip
-fix spelling
Diffstat (limited to 'src/util')
-rw-r--r--src/util/configuration.c13
-rw-r--r--src/util/gnunet-config.c11
2 files changed, 15 insertions, 9 deletions
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
194 char *main_filename; 194 char *main_filename;
195 195
196 /** 196 /**
197 * When parsing into this configuration, and this vaue 197 * When parsing into this configuration, and this value
198 * is non-NULL, only parse sections of the same name, 198 * is non-NULL, only parse sections of the same name,
199 * and ban import statements. 199 * and ban import statements.
200 */ 200 */
@@ -616,7 +616,7 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
616 { 616 {
617 fun_ret = GNUNET_OK; 617 fun_ret = GNUNET_OK;
618 } 618 }
619 cleanup: 619cleanup:
620 cfg->current_nest_level = old_nest_level; 620 cfg->current_nest_level = old_nest_level;
621 if (NULL != other_cfg) 621 if (NULL != other_cfg)
622 GNUNET_CONFIGURATION_destroy (other_cfg); 622 GNUNET_CONFIGURATION_destroy (other_cfg);
@@ -779,7 +779,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
779 { 779 {
780 LOG (GNUNET_ERROR_TYPE_WARNING, 780 LOG (GNUNET_ERROR_TYPE_WARNING,
781 _ ( 781 _ (
782 "Illegal directive in line %u (parsing resticted section %s)\n"), 782 "Illegal directive in line %u (parsing restricted section %s)\n"),
783 nr, 783 nr,
784 cfg->restrict_section); 784 cfg->restrict_section);
785 ret = GNUNET_SYSERR; 785 ret = GNUNET_SYSERR;
@@ -2300,7 +2300,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
2300 if (fun_ret != GNUNET_OK) 2300 if (fun_ret != GNUNET_OK)
2301 break; 2301 break;
2302 } 2302 }
2303 cleanup: 2303cleanup:
2304 if (files_context.files_length > 0) 2304 if (files_context.files_length > 0)
2305 { 2305 {
2306 for (size_t i = 0; i < files_context.files_length; i++) 2306 for (size_t i = 0; i < files_context.files_length; i++)
@@ -2312,6 +2312,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
2312 return fun_ret; 2312 return fun_ret;
2313} 2313}
2314 2314
2315
2315char * 2316char *
2316GNUNET_CONFIGURATION_default_filename (void) 2317GNUNET_CONFIGURATION_default_filename (void)
2317{ 2318{
@@ -2428,6 +2429,7 @@ GNUNET_CONFIGURATION_default (void)
2428 return cfg; 2429 return cfg;
2429} 2430}
2430 2431
2432
2431/** 2433/**
2432 * Load configuration (starts with defaults, then loads 2434 * Load configuration (starts with defaults, then loads
2433 * system-specific configuration). 2435 * system-specific configuration).
@@ -2477,7 +2479,7 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
2477 char *dname = GNUNET_STRINGS_filename_expand (baseconfig); 2479 char *dname = GNUNET_STRINGS_filename_expand (baseconfig);
2478 GNUNET_free (baseconfig); 2480 GNUNET_free (baseconfig);
2479 2481
2480 if ((GNUNET_YES == GNUNET_DISK_directory_test (dname, GNUNET_YES))&& 2482 if ((GNUNET_YES == GNUNET_DISK_directory_test (dname, GNUNET_YES)) &&
2481 (GNUNET_SYSERR == GNUNET_CONFIGURATION_load_from (cfg, dname))) 2483 (GNUNET_SYSERR == GNUNET_CONFIGURATION_load_from (cfg, dname)))
2482 { 2484 {
2483 LOG (GNUNET_ERROR_TYPE_WARNING, 2485 LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -2504,4 +2506,5 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
2504 return GNUNET_OK; 2506 return GNUNET_OK;
2505} 2507}
2506 2508
2509
2507/* end of configuration.c */ 2510/* 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,
193 if ( (! rewrite) && 193 if ( (! rewrite) &&
194 (NULL == section) ) 194 (NULL == section) )
195 { 195 {
196 char *ser; 196 char *serialization;
197
197 if (! diagnostics) 198 if (! diagnostics)
198 { 199 {
199 fprintf (stderr, 200 fprintf (stderr,
@@ -204,9 +205,11 @@ run (void *cls,
204 global_ret = 1; 205 global_ret = 1;
205 return; 206 return;
206 } 207 }
207 ser = GNUNET_CONFIGURATION_serialize_diagnostics (cfg); 208 serialization = GNUNET_CONFIGURATION_serialize_diagnostics (cfg);
208 printf ("%s", ser); 209 fprintf (stdout,
209 GNUNET_free (ser); 210 "%s",
211 serialization);
212 GNUNET_free (serialization);
210 } 213 }
211 else if ( (NULL != section) && 214 else if ( (NULL != section) &&
212 (NULL == value) ) 215 (NULL == value) )