diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_getopt_lib.h | 54 | ||||
-rw-r--r-- | src/include/gnunet_json_lib.h | 10 |
2 files changed, 37 insertions, 27 deletions
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h index f707bb091..e38925f14 100644 --- a/src/include/gnunet_getopt_lib.h +++ b/src/include/gnunet_getopt_lib.h | |||
@@ -230,11 +230,11 @@ GNUNET_GETOPT_option_filename (char shortName, | |||
230 | */ | 230 | */ |
231 | struct GNUNET_GETOPT_CommandLineOption | 231 | struct GNUNET_GETOPT_CommandLineOption |
232 | GNUNET_GETOPT_option_base32_fixed_size (char shortName, | 232 | GNUNET_GETOPT_option_base32_fixed_size (char shortName, |
233 | const char *name, | 233 | const char *name, |
234 | const char *argumentHelp, | 234 | const char *argumentHelp, |
235 | const char *description, | 235 | const char *description, |
236 | void *val, | 236 | void *val, |
237 | size_t val_size); | 237 | size_t val_size); |
238 | 238 | ||
239 | 239 | ||
240 | /** | 240 | /** |
@@ -264,9 +264,9 @@ GNUNET_GETOPT_option_base32_fixed_size (char shortName, | |||
264 | */ | 264 | */ |
265 | struct GNUNET_GETOPT_CommandLineOption | 265 | struct GNUNET_GETOPT_CommandLineOption |
266 | GNUNET_GETOPT_option_flag (char shortName, | 266 | GNUNET_GETOPT_option_flag (char shortName, |
267 | const char *name, | 267 | const char *name, |
268 | const char *description, | 268 | const char *description, |
269 | int *val); | 269 | int *val); |
270 | 270 | ||
271 | 271 | ||
272 | /** | 272 | /** |
@@ -280,10 +280,10 @@ GNUNET_GETOPT_option_flag (char shortName, | |||
280 | */ | 280 | */ |
281 | struct GNUNET_GETOPT_CommandLineOption | 281 | struct GNUNET_GETOPT_CommandLineOption |
282 | GNUNET_GETOPT_option_uint (char shortName, | 282 | GNUNET_GETOPT_option_uint (char shortName, |
283 | const char *name, | 283 | const char *name, |
284 | const char *argumentHelp, | 284 | const char *argumentHelp, |
285 | const char *description, | 285 | const char *description, |
286 | unsigned int *val); | 286 | unsigned int *val); |
287 | 287 | ||
288 | 288 | ||
289 | /** | 289 | /** |
@@ -297,10 +297,10 @@ GNUNET_GETOPT_option_uint (char shortName, | |||
297 | */ | 297 | */ |
298 | struct GNUNET_GETOPT_CommandLineOption | 298 | struct GNUNET_GETOPT_CommandLineOption |
299 | GNUNET_GETOPT_option_ulong (char shortName, | 299 | GNUNET_GETOPT_option_ulong (char shortName, |
300 | const char *name, | 300 | const char *name, |
301 | const char *argumentHelp, | 301 | const char *argumentHelp, |
302 | const char *description, | 302 | const char *description, |
303 | unsigned long long *val); | 303 | unsigned long long *val); |
304 | 304 | ||
305 | 305 | ||
306 | /** | 306 | /** |
@@ -315,10 +315,10 @@ GNUNET_GETOPT_option_ulong (char shortName, | |||
315 | */ | 315 | */ |
316 | struct GNUNET_GETOPT_CommandLineOption | 316 | struct GNUNET_GETOPT_CommandLineOption |
317 | GNUNET_GETOPT_option_relative_time (char shortName, | 317 | GNUNET_GETOPT_option_relative_time (char shortName, |
318 | const char *name, | 318 | const char *name, |
319 | const char *argumentHelp, | 319 | const char *argumentHelp, |
320 | const char *description, | 320 | const char *description, |
321 | struct GNUNET_TIME_Relative *val); | 321 | struct GNUNET_TIME_Relative *val); |
322 | 322 | ||
323 | 323 | ||
324 | /** | 324 | /** |
@@ -333,10 +333,10 @@ GNUNET_GETOPT_option_relative_time (char shortName, | |||
333 | */ | 333 | */ |
334 | struct GNUNET_GETOPT_CommandLineOption | 334 | struct GNUNET_GETOPT_CommandLineOption |
335 | GNUNET_GETOPT_option_absolute_time (char shortName, | 335 | GNUNET_GETOPT_option_absolute_time (char shortName, |
336 | const char *name, | 336 | const char *name, |
337 | const char *argumentHelp, | 337 | const char *argumentHelp, |
338 | const char *description, | 338 | const char *description, |
339 | struct GNUNET_TIME_Absolute *val); | 339 | struct GNUNET_TIME_Absolute *val); |
340 | 340 | ||
341 | 341 | ||
342 | /** | 342 | /** |
@@ -350,9 +350,9 @@ GNUNET_GETOPT_option_absolute_time (char shortName, | |||
350 | */ | 350 | */ |
351 | struct GNUNET_GETOPT_CommandLineOption | 351 | struct GNUNET_GETOPT_CommandLineOption |
352 | GNUNET_GETOPT_option_increment_uint (char shortName, | 352 | GNUNET_GETOPT_option_increment_uint (char shortName, |
353 | const char *name, | 353 | const char *name, |
354 | const char *description, | 354 | const char *description, |
355 | unsigned int *val); | 355 | unsigned int *val); |
356 | 356 | ||
357 | 357 | ||
358 | /** | 358 | /** |
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index f2682bea7..c12badcd9 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h | |||
@@ -343,6 +343,16 @@ GNUNET_JSON_from_time_abs (struct GNUNET_TIME_Absolute stamp); | |||
343 | 343 | ||
344 | 344 | ||
345 | /** | 345 | /** |
346 | * Convert absolute timestamp to a json string. | ||
347 | * | ||
348 | * @param stamp the time stamp | ||
349 | * @return a json string with the timestamp in @a stamp | ||
350 | */ | ||
351 | json_t * | ||
352 | GNUNET_JSON_from_time_abs_nbo (struct GNUNET_TIME_AbsoluteNBO stamp); | ||
353 | |||
354 | |||
355 | /** | ||
346 | * Convert relative timestamp to a json string. | 356 | * Convert relative timestamp to a json string. |
347 | * | 357 | * |
348 | * @param stamp the time stamp | 358 | * @param stamp the time stamp |