diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-06-18 11:00:55 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-06-18 11:00:55 +0200 |
| commit | 136adb0f87a645b392fef587a06fc34d4698f3ed (patch) | |
| tree | 115cb974f54d05870e80eb173328e86e62a51dc5 /src/include/gnunet_common.h | |
| parent | 4cdc3b856356a4eee10534834d84df4159568739 (diff) | |
| download | gnunet-136adb0f87a645b392fef587a06fc34d4698f3ed.tar.gz gnunet-136adb0f87a645b392fef587a06fc34d4698f3ed.zip | |
fix NPEs, off-by-one, etc
Diffstat (limited to 'src/include/gnunet_common.h')
| -rw-r--r-- | src/include/gnunet_common.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 6b48c81d8..66d0b8ac3 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
| @@ -507,7 +507,6 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, | |||
| 507 | #define GNUNET_log_from(kind, comp, ...) \ | 507 | #define GNUNET_log_from(kind, comp, ...) \ |
| 508 | do \ | 508 | do \ |
| 509 | { \ | 509 | { \ |
| 510 | int log_line = __LINE__; \ | ||
| 511 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS; \ | 510 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS; \ |
| 512 | if ((GNUNET_EXTRA_LOGGING > 0) || \ | 511 | if ((GNUNET_EXTRA_LOGGING > 0) || \ |
| 513 | ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ | 512 | ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ |
| @@ -518,7 +517,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, | |||
| 518 | (comp), \ | 517 | (comp), \ |
| 519 | __FILE__, \ | 518 | __FILE__, \ |
| 520 | __FUNCTION__, \ | 519 | __FUNCTION__, \ |
| 521 | log_line); \ | 520 | __LINE__); \ |
| 522 | if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ | 521 | if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ |
| 523 | { \ | 522 | { \ |
| 524 | GNUNET_log_skip (-1, GNUNET_NO); \ | 523 | GNUNET_log_skip (-1, GNUNET_NO); \ |
| @@ -534,7 +533,6 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, | |||
| 534 | #define GNUNET_log(kind, ...) \ | 533 | #define GNUNET_log(kind, ...) \ |
| 535 | do \ | 534 | do \ |
| 536 | { \ | 535 | { \ |
| 537 | int log_line = __LINE__; \ | ||
| 538 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS; \ | 536 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS; \ |
| 539 | if ((GNUNET_EXTRA_LOGGING > 0) || \ | 537 | if ((GNUNET_EXTRA_LOGGING > 0) || \ |
| 540 | ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ | 538 | ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) \ |
| @@ -545,7 +543,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, | |||
| 545 | NULL, \ | 543 | NULL, \ |
| 546 | __FILE__, \ | 544 | __FILE__, \ |
| 547 | __FUNCTION__, \ | 545 | __FUNCTION__, \ |
| 548 | log_line); \ | 546 | __LINE__); \ |
| 549 | if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ | 547 | if (GN_UNLIKELY (GNUNET_get_log_skip () > 0)) \ |
| 550 | { \ | 548 | { \ |
| 551 | GNUNET_log_skip (-1, GNUNET_NO); \ | 549 | GNUNET_log_skip (-1, GNUNET_NO); \ |