aboutsummaryrefslogtreecommitdiff
path: root/src/util/configuration.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/configuration.c')
-rw-r--r--src/util/configuration.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c
index f091c4674..06938be67 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -238,11 +238,19 @@ GNUNET_CONFIGURATION_parse_and_run (const char *filename,
238 return ret; 238 return ret;
239} 239}
240 240
241
242/**
243 * Closure to inline_glob_cb.
244 */
241struct InlineGlobClosure 245struct InlineGlobClosure
242{ 246{
247 /**
248 * Configuration to read inlined configuration into.
249 */
243 struct GNUNET_CONFIGURATION_Handle *cfg; 250 struct GNUNET_CONFIGURATION_Handle *cfg;
244}; 251};
245 252
253
246/** 254/**
247 * Function called with a filename. 255 * Function called with a filename.
248 * 256 *
@@ -291,6 +299,7 @@ find_section (const struct GNUNET_CONFIGURATION_Handle *cfg,
291 return pos; 299 return pos;
292} 300}
293 301
302
294static void 303static void
295set_section_inaccessible (struct GNUNET_CONFIGURATION_Handle *cfg, 304set_section_inaccessible (struct GNUNET_CONFIGURATION_Handle *cfg,
296 const char *section) 305 const char *section)
@@ -311,6 +320,7 @@ set_section_inaccessible (struct GNUNET_CONFIGURATION_Handle *cfg,
311 sec->inaccessible = true; 320 sec->inaccessible = true;
312} 321}
313 322
323
314/** 324/**
315 * Handle an inline directive. 325 * Handle an inline directive.
316 * 326 *
@@ -438,10 +448,10 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
438 448
439 449
440enum GNUNET_GenericReturnValue 450enum GNUNET_GenericReturnValue
441deserialize_internal (struct GNUNET_CONFIGURATION_Handle *cfg, 451GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
442 const char *mem, 452 const char *mem,
443 size_t size, 453 size_t size,
444 const char *source_filename) 454 const char *source_filename)
445{ 455{
446 size_t line_size; 456 size_t line_size;
447 unsigned int nr; 457 unsigned int nr;
@@ -669,16 +679,6 @@ deserialize_internal (struct GNUNET_CONFIGURATION_Handle *cfg,
669 679
670 680
671enum GNUNET_GenericReturnValue 681enum GNUNET_GenericReturnValue
672GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
673 const char *mem,
674 size_t size,
675 const char *source_filename)
676{
677 return deserialize_internal (cfg, mem, size, source_filename);
678}
679
680
681enum GNUNET_GenericReturnValue
682GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg, 682GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
683 const char *filename) 683 const char *filename)
684{ 684{