diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-08-10 09:45:36 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-08-10 09:45:36 -0400 |
| commit | 446dffa7f6abf5400adac9c7814440b5af3b7edd (patch) | |
| tree | 2c60643c58906c2032ee516baef20ccae098d0da /include | |
| parent | 2f35e6a3eb327b9ada5da06fb914df566da81f94 (diff) | |
GH1383: Add casts to ERR_PACK
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1385
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/err.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/openssl/err.h b/include/openssl/err.h index fdffd66db0..f9390919ab 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -133,11 +133,13 @@ typedef struct err_state_st { # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) -# define ERR_PACK(l,f,r) \ - ( ((unsigned int)((l) & 0x0FF) << 24L) | (((f) & 0xFFF) << 12L) | ((r) & 0xFFF) ) -# define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) -# define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) -# define ERR_GET_REASON(l) (int)((l)&0xfffL) +# define ERR_PACK(l,f,r) ( \ + (((unsigned int)(l) & 0x0FF) << 24L) | \ + (((unsigned int)(f) & 0xFFF) << 12L) | \ + (((unsigned int)(r) & 0xFFF) ) ) +# define ERR_GET_LIB(l) (int)(((l) >> 24L) & 0x0FFL) +# define ERR_GET_FUNC(l) (int)(((l) >> 12L) & 0xFFFL) +# define ERR_GET_REASON(l) (int)( (l) & 0xFFFL) /* OS functions */ # define SYS_F_FOPEN 1 |