commit 1738bb61e1036908eca3ae7b21be38aa493ac682
author Geoff Thorpe <geoff@openssl.org> Mon Sep 03 18:24:56 2001 +0000
committer Geoff Thorpe <geoff@openssl.org> Mon Sep 03 18:24:56 2001 +0000
tree 2bc1a8b49af0e7b2c96df8dfb19cd72515f12160
parent 91b3f0e691aa68daaaf137de2913b21260f94a05

Add a new ERR function, "ERR_unload_strings", to complement the existing
"ERR_load_strings" function.

crypto/err/err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 0152d23..81822b4 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -218,6 +218,7 @@
 	void (*cb_err_del)(void);
 	ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
 	ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
+	ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
 	/* Works on the "thread_hash" error-state table */
 	LHASH *(*cb_thread_get)(void);
 	ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
@@ -232,6 +233,7 @@
 static void int_err_del(void);
 static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
 static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
+static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
 static LHASH *int_thread_get(void);
 static ERR_STATE *int_thread_get_item(const ERR_STATE *);
 static ERR_STATE *int_thread_set_item(ERR_STATE *);
@@ -244,6 +246,7 @@
 	int_err_del,
 	int_err_get_item,
 	int_err_set_item,
+	int_err_del_item,
 	int_thread_get,
 	int_thread_get_item,
 	int_thread_set_item,
@@ -368,6 +371,19 @@
 	CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
 	return p;
 	}
+static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
+	{
+	ERR_STRING_DATA *p;
+	LHASH *hash;
+	err_fns_check();
+	hash = ERRFN(err_get)();
+	if(!hash)
+		return NULL;
+	CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+	p = (ERR_STRING_DATA *)lh_delete(hash, d);
+	CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+	return p;
+	}
 static LHASH *int_thread_get(void)
 	{
 	LHASH *toret = NULL;
@@ -545,6 +561,16 @@
 		}
 	}
 
+void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
+	{
+	while(str->error)
+		{
+		str->error|=ERR_PACK(lib,0,0);
+		ERRFN(err_del_item)(str);
+		str++;
+		}
+	}
+
 void ERR_free_strings(void)
 	{
 	err_fns_check();