diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-15 10:40:38 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-15 10:40:38 +0200 |
| commit | 190b059429aa2762e98ab781b79540ecf02ff525 (patch) | |
| tree | 6e44e9f89a0c52739b6b275820a54b38d14cefd4 /lib/errors.h | |
| parent | 78ee98e06c7862df38131b12083adc1a0c5eea4a (diff) | |
| download | gnutls-190b059429aa2762e98ab781b79540ecf02ff525.tar.gz | |
gnutls_assert_val: corrected regression from 78ee98e06c7862df38131b12083adc1a0c5eea4a
Diffstat (limited to 'lib/errors.h')
| -rw-r--r-- | lib/errors.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/errors.h b/lib/errors.h index 4c9bf0c11d..e14a4df586 100644 --- a/lib/errors.h +++ b/lib/errors.h @@ -98,13 +98,13 @@ static inline #ifdef __GNUC__ __attribute__ ((always_inline)) #endif -int gnutls_assert_val_int(int val, const char *file, int line) +int gnutls_assert_val_int(int val, const char *file, const char *func, int line) { - _gnutls_assert_log( "ASSERT: %s[%s]:%d\n", __FILE__,__func__,__LINE__); + _gnutls_assert_log( "ASSERT: %s[%s]:%d\n", file,func,line); return val; } -#define gnutls_assert_val(x) gnutls_assert_val_int(x, __FILE__, __LINE__) -#define gnutls_assert_val_fatal(x) (((x)!=GNUTLS_E_AGAIN && (x)!=GNUTLS_E_INTERRUPTED)?gnutls_assert_val_int(x, __FILE__, __LINE__):(x)) +#define gnutls_assert_val(x) gnutls_assert_val_int(x, __FILE__, __func__, __LINE__) +#define gnutls_assert_val_fatal(x) (((x)!=GNUTLS_E_AGAIN && (x)!=GNUTLS_E_INTERRUPTED)?gnutls_assert_val_int(x, __FILE__, __func__, __LINE__):(x)) #endif /* GNUTLS_ERRORS_H */ |