diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 21:29:44 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 21:29:44 +0000 |
| commit | 47a9d527aba6704cf57b9d0d18781cd55f2fc3be (patch) | |
| tree | d24c81f5921d464dba644ff371cad27568c4d639 /crypto/conf | |
| parent | d9907c972b8394f13388289284db13e5bb38ca54 (diff) | |
| download | openssl-new-47a9d527aba6704cf57b9d0d18781cd55f2fc3be.tar.gz | |
Update from 0.9.8 stable. Eliminate duplicate error codes.
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_err.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c index 6250689746..bc378a7704 100644 --- a/crypto/conf/conf_err.c +++ b/crypto/conf/conf_err.c @@ -1,6 +1,6 @@ /* crypto/conf/conf_err.c */ /* ==================================================================== - * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -118,15 +118,12 @@ static ERR_STRING_DATA CONF_str_reasons[]= void ERR_load_CONF_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(CONF_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,CONF_str_functs); ERR_load_strings(0,CONF_str_reasons); -#endif - } +#endif } |