diff options
Diffstat (limited to 'lib/gnutls_errors.h')
| -rw-r--r-- | lib/gnutls_errors.h | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/lib/gnutls_errors.h b/lib/gnutls_errors.h index 7ed3da9f45..095a08401f 100644 --- a/lib/gnutls_errors.h +++ b/lib/gnutls_errors.h @@ -24,7 +24,7 @@ */ #ifndef GNUTLS_ERRORS_H -# define GNUTLS_ERRORS_H +#define GNUTLS_ERRORS_H #include <gnutls_int.h> #include <gnutls_global.h> @@ -32,13 +32,13 @@ #define GNUTLS_E_INT_RET_0 -1251 #ifdef __FILE__ -# ifdef __LINE__ -# define gnutls_assert() _gnutls_debug_log( "ASSERT: %s:%d\n", __FILE__,__LINE__); -# else -# define gnutls_assert() -# endif +#ifdef __LINE__ +#define gnutls_assert() _gnutls_debug_log( "ASSERT: %s:%d\n", __FILE__,__LINE__); +#else +#define gnutls_assert() +#endif #else /* __FILE__ not defined */ -# define gnutls_assert() +#define gnutls_assert() #endif int _gnutls_asn2err (int asn_err); @@ -59,25 +59,25 @@ _gnutls_log (int, const char *fmt, ...) #define LEVEL_EQ(l, ...) do { if (_gnutls_log_level == l || _gnutls_log_level > 9) \ _gnutls_log( l, __VA_ARGS__); } while(0) -# define _gnutls_debug_log(...) LEVEL(2, __VA_ARGS__) -# define _gnutls_handshake_log(...) LEVEL(3, __VA_ARGS__) -# define _gnutls_io_log(...) LEVEL_EQ(5, __VA_ARGS__) -# define _gnutls_buffers_log(...) LEVEL_EQ(6, __VA_ARGS__) -# define _gnutls_hard_log(...) LEVEL(9, __VA_ARGS__) -# define _gnutls_record_log(...) LEVEL(4, __VA_ARGS__) -# define _gnutls_read_log(...) LEVEL_EQ(7, __VA_ARGS__) -# define _gnutls_write_log(...) LEVEL_EQ(7, __VA_ARGS__) -# define _gnutls_x509_log(...) LEVEL(1, __VA_ARGS__) +#define _gnutls_debug_log(...) LEVEL(2, __VA_ARGS__) +#define _gnutls_handshake_log(...) LEVEL(3, __VA_ARGS__) +#define _gnutls_io_log(...) LEVEL_EQ(5, __VA_ARGS__) +#define _gnutls_buffers_log(...) LEVEL_EQ(6, __VA_ARGS__) +#define _gnutls_hard_log(...) LEVEL(9, __VA_ARGS__) +#define _gnutls_record_log(...) LEVEL(4, __VA_ARGS__) +#define _gnutls_read_log(...) LEVEL_EQ(7, __VA_ARGS__) +#define _gnutls_write_log(...) LEVEL_EQ(7, __VA_ARGS__) +#define _gnutls_x509_log(...) LEVEL(1, __VA_ARGS__) #else -# define _gnutls_debug_log _gnutls_null_log -# define _gnutls_handshake_log _gnutls_null_log -# define _gnutls_io_log _gnutls_null_log -# define _gnutls_buffers_log _gnutls_null_log -# define _gnutls_hard_log _gnutls_null_log -# define _gnutls_record_log _gnutls_null_log -# define _gnutls_read_log _gnutls_null_log -# define _gnutls_write_log _gnutls_null_log -# define _gnutls_x509_log _gnutls_null_log +#define _gnutls_debug_log _gnutls_null_log +#define _gnutls_handshake_log _gnutls_null_log +#define _gnutls_io_log _gnutls_null_log +#define _gnutls_buffers_log _gnutls_null_log +#define _gnutls_hard_log _gnutls_null_log +#define _gnutls_record_log _gnutls_null_log +#define _gnutls_read_log _gnutls_null_log +#define _gnutls_write_log _gnutls_null_log +#define _gnutls_x509_log _gnutls_null_log void _gnutls_null_log (void *, ...); @@ -87,14 +87,13 @@ _gnutls_log (int, const char *fmt, ...) otherwise. Making this a macro has been tried, but it interacts badly with the do..while in the expansion. Welcome to the dark side. */ -static inline + static inline #ifdef __GNUC__ - __attribute__ ((always_inline)) + __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, int line) { - _gnutls_debug_log( "ASSERT: %s:%d\n", file, line); + _gnutls_debug_log ("ASSERT: %s:%d\n", file, line); return val; } |