diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-07-26 21:20:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-07-26 21:20:11 +0000 |
commit | 7bc466bbdb8b64cac68c5ee59eb7ab6b9d85c420 (patch) | |
tree | dc415457e57f9cfda58eb22ca400a941ebcf602e /src/util/test_getopt.c | |
parent | 4f8ba34b32328bd99b2f0c2ff9a2372712022b32 (diff) | |
download | gnunet-7bc466bbdb8b64cac68c5ee59eb7ab6b9d85c420.tar.gz gnunet-7bc466bbdb8b64cac68c5ee59eb7ab6b9d85c420.zip |
const-ing of config-handles
Diffstat (limited to 'src/util/test_getopt.c')
-rw-r--r-- | src/util/test_getopt.c | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 89e7be863..7168dd8c1 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c | |||
@@ -31,7 +31,6 @@ | |||
31 | static int | 31 | static int |
32 | testMinimal () | 32 | testMinimal () |
33 | { | 33 | { |
34 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
35 | char *const emptyargv[] = { | 34 | char *const emptyargv[] = { |
36 | "test", | 35 | "test", |
37 | NULL | 36 | NULL |
@@ -40,13 +39,8 @@ testMinimal () | |||
40 | GNUNET_GETOPT_OPTION_END | 39 | GNUNET_GETOPT_OPTION_END |
41 | }; | 40 | }; |
42 | 41 | ||
43 | cfg = GNUNET_CONFIGURATION_create (); | 42 | if (1 != GNUNET_GETOPT_run ("test", emptyoptionlist, 1, emptyargv)) |
44 | if (1 != GNUNET_GETOPT_run ("test", cfg, emptyoptionlist, 1, emptyargv)) | 43 | return 1; |
45 | { | ||
46 | GNUNET_CONFIGURATION_destroy (cfg); | ||
47 | return 1; | ||
48 | } | ||
49 | GNUNET_CONFIGURATION_destroy (cfg); | ||
50 | 44 | ||
51 | return 0; | 45 | return 0; |
52 | } | 46 | } |
@@ -54,7 +48,6 @@ testMinimal () | |||
54 | static int | 48 | static int |
55 | testVerbose () | 49 | testVerbose () |
56 | { | 50 | { |
57 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
58 | char *const myargv[] = { | 51 | char *const myargv[] = { |
59 | "test", | 52 | "test", |
60 | "-V", | 53 | "-V", |
@@ -68,14 +61,11 @@ testVerbose () | |||
68 | GNUNET_GETOPT_OPTION_END | 61 | GNUNET_GETOPT_OPTION_END |
69 | }; | 62 | }; |
70 | 63 | ||
71 | cfg = GNUNET_CONFIGURATION_create (); | 64 | if (3 != GNUNET_GETOPT_run ("test", verboseoptionlist, 4, myargv)) |
72 | if (3 != GNUNET_GETOPT_run ("test", cfg, verboseoptionlist, 4, myargv)) | ||
73 | { | 65 | { |
74 | GNUNET_break (0); | 66 | GNUNET_break (0); |
75 | GNUNET_CONFIGURATION_destroy (cfg); | ||
76 | return 1; | 67 | return 1; |
77 | } | 68 | } |
78 | GNUNET_CONFIGURATION_destroy (cfg); | ||
79 | if (vflags != 2) | 69 | if (vflags != 2) |
80 | { | 70 | { |
81 | GNUNET_break (0); | 71 | GNUNET_break (0); |
@@ -87,7 +77,6 @@ testVerbose () | |||
87 | static int | 77 | static int |
88 | testVersion () | 78 | testVersion () |
89 | { | 79 | { |
90 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
91 | char *const myargv[] = { | 80 | char *const myargv[] = { |
92 | "test_getopt", | 81 | "test_getopt", |
93 | "-v", | 82 | "-v", |
@@ -98,22 +87,18 @@ testVersion () | |||
98 | GNUNET_GETOPT_OPTION_END | 87 | GNUNET_GETOPT_OPTION_END |
99 | }; | 88 | }; |
100 | 89 | ||
101 | cfg = GNUNET_CONFIGURATION_create (); | ||
102 | if (-1 != GNUNET_GETOPT_run ("test_getopt", | 90 | if (-1 != GNUNET_GETOPT_run ("test_getopt", |
103 | cfg, versionoptionlist, 2, myargv)) | 91 | versionoptionlist, 2, myargv)) |
104 | { | 92 | { |
105 | GNUNET_break (0); | 93 | GNUNET_break (0); |
106 | GNUNET_CONFIGURATION_destroy (cfg); | ||
107 | return 1; | 94 | return 1; |
108 | } | 95 | } |
109 | GNUNET_CONFIGURATION_destroy (cfg); | ||
110 | return 0; | 96 | return 0; |
111 | } | 97 | } |
112 | 98 | ||
113 | static int | 99 | static int |
114 | testAbout () | 100 | testAbout () |
115 | { | 101 | { |
116 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
117 | char *const myargv[] = { | 102 | char *const myargv[] = { |
118 | "test_getopt", | 103 | "test_getopt", |
119 | "-h", | 104 | "-h", |
@@ -124,22 +109,18 @@ testAbout () | |||
124 | GNUNET_GETOPT_OPTION_END | 109 | GNUNET_GETOPT_OPTION_END |
125 | }; | 110 | }; |
126 | 111 | ||
127 | cfg = GNUNET_CONFIGURATION_create (); | ||
128 | if (-1 != GNUNET_GETOPT_run ("test_getopt", | 112 | if (-1 != GNUNET_GETOPT_run ("test_getopt", |
129 | cfg, aboutoptionlist, 2, myargv)) | 113 | aboutoptionlist, 2, myargv)) |
130 | { | 114 | { |
131 | GNUNET_break (0); | 115 | GNUNET_break (0); |
132 | GNUNET_CONFIGURATION_destroy (cfg); | ||
133 | return 1; | 116 | return 1; |
134 | } | 117 | } |
135 | GNUNET_CONFIGURATION_destroy (cfg); | ||
136 | return 0; | 118 | return 0; |
137 | } | 119 | } |
138 | 120 | ||
139 | static int | 121 | static int |
140 | testLogOpts () | 122 | testLogOpts () |
141 | { | 123 | { |
142 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
143 | char *const myargv[] = { | 124 | char *const myargv[] = { |
144 | "test_getopt", | 125 | "test_getopt", |
145 | "-l", "filename", | 126 | "-l", "filename", |
@@ -154,15 +135,12 @@ testLogOpts () | |||
154 | GNUNET_GETOPT_OPTION_END | 135 | GNUNET_GETOPT_OPTION_END |
155 | }; | 136 | }; |
156 | 137 | ||
157 | cfg = GNUNET_CONFIGURATION_create (); | 138 | if (5 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 5, myargv)) |
158 | if (5 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 5, myargv)) | ||
159 | { | 139 | { |
160 | GNUNET_break (0); | 140 | GNUNET_break (0); |
161 | GNUNET_CONFIGURATION_destroy (cfg); | ||
162 | return 1; | 141 | return 1; |
163 | } | 142 | } |
164 | GNUNET_assert (fn != NULL); | 143 | GNUNET_assert (fn != NULL); |
165 | GNUNET_CONFIGURATION_destroy (cfg); | ||
166 | if ((0 != strcmp (level, "WARNING")) || (0 != strcmp (fn, "filename"))) | 144 | if ((0 != strcmp (level, "WARNING")) || (0 != strcmp (fn, "filename"))) |
167 | { | 145 | { |
168 | GNUNET_break (0); | 146 | GNUNET_break (0); |
@@ -178,7 +156,6 @@ testLogOpts () | |||
178 | static int | 156 | static int |
179 | testFlagNum () | 157 | testFlagNum () |
180 | { | 158 | { |
181 | struct GNUNET_CONFIGURATION_Handle *cfg; | ||
182 | char *const myargv[] = { | 159 | char *const myargv[] = { |
183 | "test_getopt", | 160 | "test_getopt", |
184 | "-f", | 161 | "-f", |
@@ -199,14 +176,11 @@ testFlagNum () | |||
199 | GNUNET_GETOPT_OPTION_END | 176 | GNUNET_GETOPT_OPTION_END |
200 | }; | 177 | }; |
201 | 178 | ||
202 | cfg = GNUNET_CONFIGURATION_create (); | 179 | if (6 != GNUNET_GETOPT_run ("test_getopt", logoptionlist, 6, myargv)) |
203 | if (6 != GNUNET_GETOPT_run ("test_getopt", cfg, logoptionlist, 6, myargv)) | ||
204 | { | 180 | { |
205 | GNUNET_break (0); | 181 | GNUNET_break (0); |
206 | GNUNET_CONFIGURATION_destroy (cfg); | ||
207 | return 1; | 182 | return 1; |
208 | } | 183 | } |
209 | GNUNET_CONFIGURATION_destroy (cfg); | ||
210 | if ((1 != flag) || (42 != num) || (42 != lnum)) | 184 | if ((1 != flag) || (42 != num) || (42 != lnum)) |
211 | { | 185 | { |
212 | GNUNET_break (0); | 186 | GNUNET_break (0); |