diff options
-rw-r--r-- | lib/minitasn1/errors.c | 12 | ||||
-rw-r--r-- | lib/minitasn1/errors.h | 30 | ||||
-rw-r--r-- | lib/minitasn1/libtasn1.h | 2 |
3 files changed, 6 insertions, 38 deletions
diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c index 96fdd3ec6b..d59e0838bc 100644 --- a/lib/minitasn1/errors.c +++ b/lib/minitasn1/errors.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Fabio Fiorina +/* Copyright (C) 2002, 2005 Fabio Fiorina * * This file is part of LIBASN1. * @@ -121,11 +121,7 @@ void _libtasn1_log( const char *fmt, ...) { return; } #else /* not DEBUG */ -# ifndef C99_MACROS - -/* Without C99 macros these functions have to - * be called. This may affect performance. - */ -void _libtasn1_null_log( void* x, ...) { return; } -# endif /* C99_MACROS */ +void _libtasn1_log( const char *fmt, ...) { + return; +} #endif /* DEBUG */ diff --git a/lib/minitasn1/errors.h b/lib/minitasn1/errors.h index b4a03713ca..a5f0377200 100644 --- a/lib/minitasn1/errors.h +++ b/lib/minitasn1/errors.h @@ -21,40 +21,12 @@ #ifndef ERRORS_H #define ERRORS_H - #include "int.h" #include "errors_int.h" -#ifdef LIBTASN1_DEBUG -# ifdef __FILE__ -# ifdef __LINE__ -# define _libtasn1_assert() fprintf(stderr, "LIBTASN1_ASSERT: %s:%d\n", __FILE__,__LINE__); -# else -# define _libtasn1_assert() -# endif -# else /* __FILE__ defined */ -# define _libtasn1_assert() -# endif -#else /* no debug */ -# define _libtasn1_assert() -#endif - const char* libtasn1_strerror(int error); void libtasn1_perror(int error); -#ifdef LIBTASN1_DEBUG - void _libtasn1_log( const char *fmt, ...); -#else - -/* These macros only work with C99 compliant compilers - */ -# ifdef C99_MACROS -# define _libtasn1_log(...) -# else -# define _libtasn1_log _libtasn1_null_log -void _libtasn1_null_log( void*, ...); -# endif /* C99_MACROS */ - -#endif /* DEBUG */ +void _libtasn1_log( const char *fmt, ...); #endif /* ERRORS_H */ diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h index c89502b02b..2098059eea 100644 --- a/lib/minitasn1/libtasn1.h +++ b/lib/minitasn1/libtasn1.h @@ -30,7 +30,7 @@ extern "C" { #endif -#define LIBTASN1_VERSION "0.2.14" +#define LIBTASN1_VERSION "0.2.15" #include <sys/types.h> #include <time.h> |