diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-11 13:41:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-11 13:41:40 +0000 |
commit | fd6abc8eccbbf839d877062ff63cab510f3ae707 (patch) | |
tree | 718186b113fbe9b6779a072362068fdaa9df2169 /src/util/test_configuration.c | |
parent | 9a50e92d4a43f917b0cd1ed34d4932470cb3a3da (diff) | |
download | gnunet-fd6abc8eccbbf839d877062ff63cab510f3ae707.tar.gz gnunet-fd6abc8eccbbf839d877062ff63cab510f3ae707.zip |
-doxygen, code style, indentation fixes
Diffstat (limited to 'src/util/test_configuration.c')
-rw-r--r-- | src/util/test_configuration.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index e68740e7f..5098f96c9 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c | |||
@@ -42,7 +42,7 @@ enum | |||
42 | }; | 42 | }; |
43 | 43 | ||
44 | static struct GNUNET_CONFIGURATION_Handle *cfg; | 44 | static struct GNUNET_CONFIGURATION_Handle *cfg; |
45 | static struct GNUNET_CONFIGURATION_Handle *cfgDefault; | 45 | static struct GNUNET_CONFIGURATION_Handle *cfg_default; |
46 | 46 | ||
47 | struct DiffsCBData | 47 | struct DiffsCBData |
48 | { | 48 | { |
@@ -199,7 +199,7 @@ editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg, int option) | |||
199 | * Checking configuration diffs | 199 | * Checking configuration diffs |
200 | */ | 200 | */ |
201 | static int | 201 | static int |
202 | checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfgDefault, int option) | 202 | checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfg_default, int option) |
203 | { | 203 | { |
204 | struct GNUNET_CONFIGURATION_Handle *cfg; | 204 | struct GNUNET_CONFIGURATION_Handle *cfg; |
205 | struct GNUNET_CONFIGURATION_Handle *cfgDiffs; | 205 | struct GNUNET_CONFIGURATION_Handle *cfgDiffs; |
@@ -223,7 +223,7 @@ checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfgDefault, int option) | |||
223 | GNUNET_CONFIGURATION_destroy (cfgDiffs); | 223 | GNUNET_CONFIGURATION_destroy (cfgDiffs); |
224 | return 1; | 224 | return 1; |
225 | } | 225 | } |
226 | GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, diffsFileName); | 226 | GNUNET_CONFIGURATION_write_diffs (cfg_default, cfg, diffsFileName); |
227 | GNUNET_CONFIGURATION_destroy (cfg); | 227 | GNUNET_CONFIGURATION_destroy (cfg); |
228 | 228 | ||
229 | /* Compare the dumped configuration with modifications done */ | 229 | /* Compare the dumped configuration with modifications done */ |
@@ -514,30 +514,30 @@ main (int argc, char *argv[]) | |||
514 | GNUNET_CONFIGURATION_destroy (cfg); | 514 | GNUNET_CONFIGURATION_destroy (cfg); |
515 | 515 | ||
516 | /* Testing configuration diffs */ | 516 | /* Testing configuration diffs */ |
517 | cfgDefault = GNUNET_CONFIGURATION_create (); | 517 | cfg_default = GNUNET_CONFIGURATION_create (); |
518 | if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfgDefault, NULL)) | 518 | if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg_default, NULL)) |
519 | { | 519 | { |
520 | GNUNET_break (0); | 520 | GNUNET_break (0); |
521 | GNUNET_CONFIGURATION_destroy (cfgDefault); | 521 | GNUNET_CONFIGURATION_destroy (cfg_default); |
522 | return 1; | 522 | return 1; |
523 | } | 523 | } |
524 | 524 | ||
525 | /* Nothing changed in the new configuration */ | 525 | /* Nothing changed in the new configuration */ |
526 | failureCount += checkDiffs (cfgDefault, EDIT_NOTHING); | 526 | failureCount += checkDiffs (cfg_default, EDIT_NOTHING); |
527 | 527 | ||
528 | /* Modify all entries of the last section */ | 528 | /* Modify all entries of the last section */ |
529 | failureCount += checkDiffs (cfgDefault, EDIT_SECTION); | 529 | failureCount += checkDiffs (cfg_default, EDIT_SECTION); |
530 | 530 | ||
531 | /* Add a new section */ | 531 | /* Add a new section */ |
532 | failureCount += checkDiffs (cfgDefault, ADD_NEW_SECTION); | 532 | failureCount += checkDiffs (cfg_default, ADD_NEW_SECTION); |
533 | 533 | ||
534 | /* Add a new entry to the last section */ | 534 | /* Add a new entry to the last section */ |
535 | failureCount += checkDiffs (cfgDefault, ADD_NEW_ENTRY); | 535 | failureCount += checkDiffs (cfg_default, ADD_NEW_ENTRY); |
536 | 536 | ||
537 | /* Modify all entries in the configuration */ | 537 | /* Modify all entries in the configuration */ |
538 | failureCount += checkDiffs (cfgDefault, EDIT_ALL); | 538 | failureCount += checkDiffs (cfg_default, EDIT_ALL); |
539 | 539 | ||
540 | GNUNET_CONFIGURATION_destroy (cfgDefault); | 540 | GNUNET_CONFIGURATION_destroy (cfg_default); |
541 | 541 | ||
542 | error: | 542 | error: |
543 | if (failureCount != 0) | 543 | if (failureCount != 0) |