diff options
Diffstat (limited to 'src/util/test_getopt.c')
-rw-r--r-- | src/util/test_getopt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 13cedd7f5..16f2df8d1 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c | |||
@@ -56,7 +56,7 @@ testVerbose () | |||
56 | unsigned int vflags = 0; | 56 | unsigned int vflags = 0; |
57 | 57 | ||
58 | const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = { | 58 | const struct GNUNET_GETOPT_CommandLineOption verboseoptionlist[] = { |
59 | GNUNET_GETOPT_OPTION_VERBOSE (&vflags), | 59 | GNUNET_GETOPT_option_verbose (&vflags), |
60 | GNUNET_GETOPT_OPTION_END | 60 | GNUNET_GETOPT_OPTION_END |
61 | }; | 61 | }; |
62 | 62 | ||
@@ -83,7 +83,7 @@ testVersion () | |||
83 | NULL | 83 | NULL |
84 | }; | 84 | }; |
85 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { | 85 | const struct GNUNET_GETOPT_CommandLineOption versionoptionlist[] = { |
86 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION), | 86 | GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION), |
87 | GNUNET_GETOPT_OPTION_END | 87 | GNUNET_GETOPT_OPTION_END |
88 | }; | 88 | }; |
89 | 89 | ||
@@ -105,7 +105,7 @@ testAbout () | |||
105 | NULL | 105 | NULL |
106 | }; | 106 | }; |
107 | const struct GNUNET_GETOPT_CommandLineOption aboutoptionlist[] = { | 107 | const struct GNUNET_GETOPT_CommandLineOption aboutoptionlist[] = { |
108 | GNUNET_GETOPT_OPTION_HELP ("Testing"), | 108 | GNUNET_GETOPT_option_help ("Testing"), |
109 | GNUNET_GETOPT_OPTION_END | 109 | GNUNET_GETOPT_OPTION_END |
110 | }; | 110 | }; |
111 | 111 | ||
@@ -131,8 +131,8 @@ testLogOpts () | |||
131 | char *fn = NULL; | 131 | char *fn = NULL; |
132 | 132 | ||
133 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { | 133 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { |
134 | GNUNET_GETOPT_OPTION_LOGFILE (&fn), | 134 | GNUNET_GETOPT_option_logfile (&fn), |
135 | GNUNET_GETOPT_OPTION_LOGLEVEL (&level), | 135 | GNUNET_GETOPT_option_loglevel (&level), |
136 | GNUNET_GETOPT_OPTION_END | 136 | GNUNET_GETOPT_OPTION_END |
137 | }; | 137 | }; |
138 | 138 | ||
@@ -173,16 +173,16 @@ testFlagNum () | |||
173 | unsigned long long lnum = 0; | 173 | unsigned long long lnum = 0; |
174 | 174 | ||
175 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { | 175 | const struct GNUNET_GETOPT_CommandLineOption logoptionlist[] = { |
176 | GNUNET_GETOPT_OPTION_SET_ONE ('f', | 176 | GNUNET_GETOPT_option_flag ('f', |
177 | "--flag", | 177 | "--flag", |
178 | "helptext", | 178 | "helptext", |
179 | &flag), | 179 | &flag), |
180 | GNUNET_GETOPT_OPTION_SET_UINT ('n', | 180 | GNUNET_GETOPT_option_uint ('n', |
181 | "--num", | 181 | "--num", |
182 | "ARG", | 182 | "ARG", |
183 | "helptext", | 183 | "helptext", |
184 | &num), | 184 | &num), |
185 | GNUNET_GETOPT_OPTION_SET_ULONG ('N', | 185 | GNUNET_GETOPT_option_ulong ('N', |
186 | "--lnum", | 186 | "--lnum", |
187 | "ARG", | 187 | "ARG", |
188 | "helptext", | 188 | "helptext", |