aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-27 11:50:21 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-27 11:50:21 +0200
commit740355cd63dcd248d7cfd75129dc67e7667ecfe9 (patch)
treee8b3a1bfbf30e3644294a7108d94dc0a9169eaf7 /src
parent8703a0516f92819ea97d991984540332c061fe17 (diff)
downloadgnunet-740355cd63dcd248d7cfd75129dc67e7667ecfe9.tar.gz
gnunet-740355cd63dcd248d7cfd75129dc67e7667ecfe9.zip
use better return type
Diffstat (limited to 'src')
-rw-r--r--src/include/gnunet_common.h38
-rw-r--r--src/include/gnunet_json_lib.h2
-rw-r--r--src/json/json.c2
3 files changed, 21 insertions, 21 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 91d4a5bd4..b2f99cd55 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -457,11 +457,11 @@ __attribute__ ((format (printf, 2, 3)));
457 __extension__ ({ \ 457 __extension__ ({ \
458 int _gnunet_boolean_var_; \ 458 int _gnunet_boolean_var_; \
459 if (expr) \ 459 if (expr) \
460 _gnunet_boolean_var_ = 1; \ 460 _gnunet_boolean_var_ = 1; \
461 else \ 461 else \
462 _gnunet_boolean_var_ = 0; \ 462 _gnunet_boolean_var_ = 0; \
463 _gnunet_boolean_var_; \ 463 _gnunet_boolean_var_; \
464 }) 464 })
465#define GN_LIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 1)) 465#define GN_LIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 1))
466#define GN_UNLIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 0)) 466#define GN_UNLIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 0))
467#else 467#else
@@ -499,12 +499,12 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
499 ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ 499 ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \
500 { \ 500 { \
501 if (GN_UNLIKELY (log_call_enabled == -1)) \ 501 if (GN_UNLIKELY (log_call_enabled == -1)) \
502 log_call_enabled = \ 502 log_call_enabled = \
503 GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \ 503 GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
504 (comp), \ 504 (comp), \
505 __FILE__, \ 505 __FILE__, \
506 __FUNCTION__, \ 506 __FUNCTION__, \
507 __LINE__); \ 507 __LINE__); \
508 if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ 508 if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \
509 { \ 509 { \
510 GNUNET_log_skip (-1, GNUNET_NO); \ 510 GNUNET_log_skip (-1, GNUNET_NO); \
@@ -512,7 +512,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
512 else \ 512 else \
513 { \ 513 { \
514 if (GN_UNLIKELY (log_call_enabled)) \ 514 if (GN_UNLIKELY (log_call_enabled)) \
515 GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__); \ 515 GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__); \
516 } \ 516 } \
517 } \ 517 } \
518 } while (0) 518 } while (0)
@@ -525,12 +525,12 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
525 ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ 525 ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \
526 { \ 526 { \
527 if (GN_UNLIKELY (log_call_enabled == -1)) \ 527 if (GN_UNLIKELY (log_call_enabled == -1)) \
528 log_call_enabled = \ 528 log_call_enabled = \
529 GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \ 529 GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
530 NULL, \ 530 NULL, \
531 __FILE__, \ 531 __FILE__, \
532 __FUNCTION__, \ 532 __FUNCTION__, \
533 __LINE__); \ 533 __LINE__); \
534 if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ 534 if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \
535 { \ 535 { \
536 GNUNET_log_skip (-1, GNUNET_NO); \ 536 GNUNET_log_skip (-1, GNUNET_NO); \
@@ -538,7 +538,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
538 else \ 538 else \
539 { \ 539 { \
540 if (GN_UNLIKELY (log_call_enabled)) \ 540 if (GN_UNLIKELY (log_call_enabled)) \
541 GNUNET_log_nocheck ((kind), __VA_ARGS__); \ 541 GNUNET_log_nocheck ((kind), __VA_ARGS__); \
542 } \ 542 } \
543 } \ 543 } \
544 } while (0) 544 } while (0)
@@ -1319,8 +1319,8 @@ GNUNET_is_zero_ (const void *a,
1319 * been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier. NULL is allowed. 1319 * been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier. NULL is allowed.
1320 */ 1320 */
1321#define GNUNET_free(ptr) do { \ 1321#define GNUNET_free(ptr) do { \
1322 GNUNET_xfree_ (ptr, __FILE__, __LINE__); \ 1322 GNUNET_xfree_ (ptr, __FILE__, __LINE__); \
1323 ptr = NULL; \ 1323 ptr = NULL; \
1324} while (0) 1324} while (0)
1325 1325
1326 1326
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 95d136239..07a14d329 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -127,7 +127,7 @@ struct GNUNET_JSON_Specification
127 * @param[out] which index into @a spec did we encounter an error 127 * @param[out] which index into @a spec did we encounter an error
128 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error 128 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
129 */ 129 */
130int 130enum GNUNET_GenericReturnValue
131GNUNET_JSON_parse (const json_t *root, 131GNUNET_JSON_parse (const json_t *root,
132 struct GNUNET_JSON_Specification *spec, 132 struct GNUNET_JSON_Specification *spec,
133 const char **error_json_name, 133 const char **error_json_name,
diff --git a/src/json/json.c b/src/json/json.c
index f6d2406c4..0631c51bb 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -41,7 +41,7 @@
41 * @param[out] which index into @a spec did we encounter an error 41 * @param[out] which index into @a spec did we encounter an error
42 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error 42 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
43 */ 43 */
44int 44enum GNUNET_GenericReturnValue
45GNUNET_JSON_parse (const json_t *root, 45GNUNET_JSON_parse (const json_t *root,
46 struct GNUNET_JSON_Specification *spec, 46 struct GNUNET_JSON_Specification *spec,
47 const char **error_json_name, 47 const char **error_json_name,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-18 06:44:26 +0000