summaryrefslogtreecommitdiffstats
path: root/crypto/cpt_err.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-11-21 21:29:44 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-11-21 21:29:44 +0000
commit47a9d527aba6704cf57b9d0d18781cd55f2fc3be (patch)
treed24c81f5921d464dba644ff371cad27568c4d639 /crypto/cpt_err.c
parentd9907c972b8394f13388289284db13e5bb38ca54 (diff)
Update from 0.9.8 stable. Eliminate duplicate error codes.
Diffstat (limited to 'crypto/cpt_err.c')
-rw-r--r--crypto/cpt_err.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index 06a6109cce..139b9284e4 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -1,6 +1,6 @@
/* crypto/cpt_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
@@ -92,15 +92,12 @@ static ERR_STRING_DATA CRYPTO_str_reasons[]=
void ERR_load_CRYPTO_strings(void)
{
- static int init=1;
+#ifndef OPENSSL_NO_ERR
- if (init)
+ if (ERR_func_error_string(CRYPTO_str_functs[0].error) == NULL)
{
- init=0;
-#ifndef OPENSSL_NO_ERR
ERR_load_strings(0,CRYPTO_str_functs);
ERR_load_strings(0,CRYPTO_str_reasons);
-#endif
-
}
+#endif
}