diff options
Diffstat (limited to 'src/include/gnunet_configuration_lib.h')
-rw-r--r-- | src/include/gnunet_configuration_lib.h | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index 4ecb3539f..24705f0fb 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h | |||
@@ -113,11 +113,10 @@ int GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
113 | * @param filename where to write the configuration diff between default and new | 113 | * @param filename where to write the configuration diff between default and new |
114 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 114 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
115 | */ | 115 | */ |
116 | int | 116 | int GNUNET_CONFIGURATION_write_diffs (const struct GNUNET_CONFIGURATION_Handle |
117 | GNUNET_CONFIGURATION_write_diffs (const struct GNUNET_CONFIGURATION_Handle | 117 | *cfgDefault, |
118 | *cfgDefault, | 118 | const struct GNUNET_CONFIGURATION_Handle |
119 | const struct GNUNET_CONFIGURATION_Handle | 119 | *cfgNew, const char *filename); |
120 | *cfgNew, const char *filename); | ||
121 | 120 | ||
122 | /** | 121 | /** |
123 | * Test if there are configuration options that were | 122 | * Test if there are configuration options that were |
@@ -138,8 +137,7 @@ int GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle | |||
138 | * @param option name of the option | 137 | * @param option name of the option |
139 | * @param value value of the option | 138 | * @param value value of the option |
140 | */ | 139 | */ |
141 | typedef void (*GNUNET_CONFIGURATION_Iterator) (void *cls, | 140 | typedef void (*GNUNET_CONFIGURATION_Iterator) (void *cls, const char *section, |
142 | const char *section, | ||
143 | const char *option, | 141 | const char *option, |
144 | const char *value); | 142 | const char *value); |
145 | 143 | ||
@@ -277,11 +275,10 @@ int GNUNET_CONFIGURATION_get_value_filename (const struct | |||
277 | */ | 275 | */ |
278 | int GNUNET_CONFIGURATION_iterate_value_filenames (const struct | 276 | int GNUNET_CONFIGURATION_iterate_value_filenames (const struct |
279 | GNUNET_CONFIGURATION_Handle | 277 | GNUNET_CONFIGURATION_Handle |
280 | *cfg, | 278 | *cfg, const char *section, |
281 | const char *section, | ||
282 | const char *option, | 279 | const char *option, |
283 | GNUNET_FileNameCallback | 280 | GNUNET_FileNameCallback cb, |
284 | cb, void *cb_cls); | 281 | void *cb_cls); |
285 | 282 | ||
286 | /** | 283 | /** |
287 | * Iterate over values of a section in the configuration. | 284 | * Iterate over values of a section in the configuration. |
@@ -291,12 +288,11 @@ int GNUNET_CONFIGURATION_iterate_value_filenames (const struct | |||
291 | * @param iter function to call on each option | 288 | * @param iter function to call on each option |
292 | * @param iter_cls closure for iter | 289 | * @param iter_cls closure for iter |
293 | */ | 290 | */ |
294 | void | 291 | void GNUNET_CONFIGURATION_iterate_section_values (const struct |
295 | GNUNET_CONFIGURATION_iterate_section_values (const struct | 292 | GNUNET_CONFIGURATION_Handle |
296 | GNUNET_CONFIGURATION_Handle *cfg, | 293 | *cfg, const char *section, |
297 | const char *section, | 294 | GNUNET_CONFIGURATION_Iterator |
298 | GNUNET_CONFIGURATION_Iterator iter, | 295 | iter, void *iter_cls); |
299 | void *iter_cls); | ||
300 | 296 | ||
301 | /** | 297 | /** |
302 | * Get a configuration value that should be in a set of | 298 | * Get a configuration value that should be in a set of |
@@ -353,12 +349,10 @@ char *GNUNET_CONFIGURATION_expand_dollar (const struct | |||
353 | * @param option option of interest | 349 | * @param option option of interest |
354 | * @param number value to set | 350 | * @param number value to set |
355 | */ | 351 | */ |
356 | void | 352 | void GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle |
357 | GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle | 353 | *cfg, const char *section, |
358 | *cfg, | 354 | const char *option, |
359 | const char *section, | 355 | unsigned long long number); |
360 | const char *option, | ||
361 | unsigned long long number); | ||
362 | 356 | ||
363 | 357 | ||
364 | /** | 358 | /** |
@@ -369,11 +363,10 @@ GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle | |||
369 | * @param option option of interest | 363 | * @param option option of interest |
370 | * @param value value to set | 364 | * @param value value to set |
371 | */ | 365 | */ |
372 | void | 366 | void GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle |
373 | GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle | 367 | *cfg, const char *section, |
374 | *cfg, | 368 | const char *option, |
375 | const char *section, | 369 | const char *value); |
376 | const char *option, const char *value); | ||
377 | 370 | ||
378 | /** | 371 | /** |
379 | * Remove a filename from a configuration value that | 372 | * Remove a filename from a configuration value that |
@@ -388,8 +381,7 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle | |||
388 | */ | 381 | */ |
389 | int GNUNET_CONFIGURATION_remove_value_filename (struct | 382 | int GNUNET_CONFIGURATION_remove_value_filename (struct |
390 | GNUNET_CONFIGURATION_Handle | 383 | GNUNET_CONFIGURATION_Handle |
391 | *cfg, | 384 | *cfg, const char *section, |
392 | const char *section, | ||
393 | const char *option, | 385 | const char *option, |
394 | const char *value); | 386 | const char *value); |
395 | 387 | ||