aboutsummaryrefslogtreecommitdiff
path: root/src/util/gnunet-config-diff.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:46:35 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:46:35 +0000
commit502af2167f7c218366666ca4944bd7cc54b5b19a (patch)
treea91fec5cc9769d260640bd91c6633cb9cf395524 /src/util/gnunet-config-diff.c
parent03af5a603b7cc53432249d5854cd412aa90dde0d (diff)
downloadgnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz
gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip
indentation
Diffstat (limited to 'src/util/gnunet-config-diff.c')
-rw-r--r--src/util/gnunet-config-diff.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/util/gnunet-config-diff.c b/src/util/gnunet-config-diff.c
index 3c0af8f24..02ffa77a1 100644
--- a/src/util/gnunet-config-diff.c
+++ b/src/util/gnunet-config-diff.c
@@ -1,28 +1,24 @@
1#include "platform.h" 1#include "platform.h"
2#include <gnunet_util_lib.h> 2#include <gnunet_util_lib.h>
3 3
4int main(int argc, 4int
5 char **argv) 5main (int argc, char **argv)
6{ 6{
7 struct GNUNET_CONFIGURATION_Handle *i1; 7 struct GNUNET_CONFIGURATION_Handle *i1;
8 struct GNUNET_CONFIGURATION_Handle *i2; 8 struct GNUNET_CONFIGURATION_Handle *i2;
9 9
10 if (argc != 3) 10 if (argc != 3)
11 { 11 {
12 fprintf (stderr, 12 fprintf (stderr, "Invoke using `%s DEFAULTS-IN DIFFS'\n", argv[0]);
13 "Invoke using `%s DEFAULTS-IN DIFFS'\n", 13 return 1;
14 argv[0]); 14 }
15 return 1;
16 }
17 i1 = GNUNET_CONFIGURATION_create (); 15 i1 = GNUNET_CONFIGURATION_create ();
18 i2 = GNUNET_CONFIGURATION_create (); 16 i2 = GNUNET_CONFIGURATION_create ();
19 if ( (GNUNET_OK != 17 if ((GNUNET_OK !=
20 GNUNET_CONFIGURATION_load (i1, argv[1])) || 18 GNUNET_CONFIGURATION_load (i1, argv[1])) ||
21 (GNUNET_OK != 19 (GNUNET_OK != GNUNET_CONFIGURATION_load (i2, argv[2])))
22 GNUNET_CONFIGURATION_load (i2, argv[2])) )
23 return 1; 20 return 1;
24 if (GNUNET_OK != 21 if (GNUNET_OK != GNUNET_CONFIGURATION_write_diffs (i1, i2, argv[2]))
25 GNUNET_CONFIGURATION_write_diffs (i1, i2, argv[2]))
26 return 2; 22 return 2;
27 return 0; 23 return 0;
28} 24}