diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2007-02-22 14:53:49 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-22 14:53:49 +0000 |
| commit | b01a74a9d757ce2b83465214bde1fa07d3e2d3ea (patch) | |
| tree | 092cac6797947f7b23fcdcc2c081b19c390c5bc4 /libtomcrypt/src/headers/tomcrypt_argchk.h | |
| parent | 66643fa5c723da2dc781c5eeae2e008c280a7b1c (diff) | |
| parent | 7f12251fbb2acefac04e13a7c6a95ca4dd4b5578 (diff) | |
merge of 'a9b0496634cdd25647b65e585cc3240f3fa699ee'
and 'c22be8b8f570b48e9662dac32c7b3e7148a42206'
--HG--
extra : convert_revision : 066f6aef2791d54b9ec6a0c3033fd28fa946251f
Diffstat (limited to 'libtomcrypt/src/headers/tomcrypt_argchk.h')
| -rw-r--r-- | libtomcrypt/src/headers/tomcrypt_argchk.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libtomcrypt/src/headers/tomcrypt_argchk.h b/libtomcrypt/src/headers/tomcrypt_argchk.h index ef344ee..cfc93ad 100644 --- a/libtomcrypt/src/headers/tomcrypt_argchk.h +++ b/libtomcrypt/src/headers/tomcrypt_argchk.h @@ -7,19 +7,32 @@ /* this is the default LibTomCrypt macro */ void crypt_argchk(char *v, char *s, int d); #define LTC_ARGCHK(x) if (!(x)) { crypt_argchk(#x, __FILE__, __LINE__); } +#define LTC_ARGCHKVD(x) LTC_ARGCHK(x) #elif ARGTYPE == 1 /* fatal type of error */ #define LTC_ARGCHK(x) assert((x)) +#define LTC_ARGCHKVD(x) LTC_ARGCHK(x) #elif ARGTYPE == 2 +#define LTC_ARGCHK(x) if (!(x)) { fprintf(stderr, "\nwarning: ARGCHK failed at %s:%d\n", __FILE__, __LINE__); } +#define LTC_ARGCHKVD(x) LTC_ARGCHK(x) + +#elif ARGTYPE == 3 + #define LTC_ARGCHK(x) +#define LTC_ARGCHKVD(x) LTC_ARGCHK(x) + +#elif ARGTYPE == 4 + +#define LTC_ARGCHK(x) if (!(x)) return CRYPT_INVALID_ARG; +#define LTC_ARGCHKVD(x) if (!(x)) return; #endif /* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_argchk.h,v $ */ -/* $Revision: 1.2 $ */ -/* $Date: 2005/05/05 14:35:58 $ */ +/* $Revision: 1.5 $ */ +/* $Date: 2006/08/27 20:50:21 $ */ |