Some error code cleanups (SSL lib. used SSL_R_... codes reserved for alerts)

3 files changed, 16 insertions, 11 deletions

diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index c1d0dfeebb..8934c4ee21 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -350,26 +350,31 @@ void ERR_load_DSO_strings(void);
 #define DSO_F_DSO_FREE					 111
 #define DSO_F_DSO_GET_FILENAME				 127
 #define DSO_F_DSO_GET_LOADED_FILENAME			 128
+#define DSO_F_DSO_GLOBAL_LOOKUP				 139
 #define DSO_F_DSO_LOAD					 112
 #define DSO_F_DSO_MERGE					 132
 #define DSO_F_DSO_NEW_METHOD				 113
+#define DSO_F_DSO_PATHBYADDR				 140
 #define DSO_F_DSO_SET_FILENAME				 129
 #define DSO_F_DSO_SET_NAME_CONVERTER			 122
 #define DSO_F_DSO_UP_REF				 114
+#define DSO_F_GLOBAL_LOOKUP_FUNC			 138
+#define DSO_F_PATHBYADDR				 137
 #define DSO_F_VMS_BIND_SYM				 115
 #define DSO_F_VMS_LOAD					 116
 #define DSO_F_VMS_MERGER				 133
 #define DSO_F_VMS_UNLOAD				 117
 #define DSO_F_WIN32_BIND_FUNC				 118
 #define DSO_F_WIN32_BIND_VAR				 119
+#define DSO_F_WIN32_GLOBALLOOKUP			 142
+#define DSO_F_WIN32_GLOBALLOOKUP_FUNC			 143
 #define DSO_F_WIN32_JOINER				 135
 #define DSO_F_WIN32_LOAD				 120
 #define DSO_F_WIN32_MERGER				 134
 #define DSO_F_WIN32_NAME_CONVERTER			 125
+#define DSO_F_WIN32_PATHBYADDR				 141
 #define DSO_F_WIN32_SPLITTER				 136
 #define DSO_F_WIN32_UNLOAD				 121
-#define DSO_F_PATHBYADDR				 137
-#define DSO_F_GLOBAL_LOOKUP_FUNC			 138
 
 /* Reason codes. */
 #define DSO_R_CTRL_FAILED				 100
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index c9d978b527..1e3d81ce4c 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -471,7 +471,7 @@ int DSO_pathbyaddr(void *addr,char *path,int sz)
 	if (meth == NULL) meth = DSO_METHOD_openssl();
 	if (meth->pathbyaddr == NULL)
 		{
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_DSO_PATHBYADDR,DSO_R_UNSUPPORTED);
 		return -1;
 		}
 	return (*meth->pathbyaddr)(addr,path,sz);
@@ -483,7 +483,7 @@ void *DSO_global_lookup(const char *name)
 	if (meth == NULL) meth = DSO_METHOD_openssl();
 	if (meth->globallookup == NULL)
 		{
-		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_DSO_GLOBAL_LOOKUP,DSO_R_UNSUPPORTED);
 		return NULL;
 		}
 	return (*meth->globallookup)(name);
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 7a3e2b70e2..34b94b3d1d 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -698,7 +698,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
 	dll = LoadLibrary(TEXT(DLLNAME));
 	if (dll == NULL)
 		{
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);
 		return -1;
 		}
 
@@ -707,7 +707,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
 	if (create_snap == NULL)
 		{
 		FreeLibrary(dll);
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);
 		return -1;
 		}
 	/* We take the rest for granted... */
@@ -724,7 +724,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
 	if( hModuleSnap == INVALID_HANDLE_VALUE ) 
 		{ 
 		FreeLibrary(dll);
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_UNSUPPORTED);
 		return -1;
 		} 
  
@@ -734,7 +734,7 @@ static int win32_pathbyaddr(void *addr,char *path,int sz)
 		{ 
 		(*close_snap)(hModuleSnap);
 		FreeLibrary(dll);
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_FAILURE);
+		DSOerr(DSO_F_WIN32_PATHBYADDR,DSO_R_FAILURE);
 		return -1;
 		}
  
@@ -786,7 +786,7 @@ static void *win32_globallookup(const char *name)
 	dll = LoadLibrary(TEXT(DLLNAME));
 	if (dll == NULL)
 		{
-		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);
 		return NULL;
 		}
 
@@ -795,7 +795,7 @@ static void *win32_globallookup(const char *name)
 	if (create_snap == NULL)
 		{
 		FreeLibrary(dll);
-		DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);
 		return NULL;
 		}
 	/* We take the rest for granted... */
@@ -812,7 +812,7 @@ static void *win32_globallookup(const char *name)
 	if( hModuleSnap == INVALID_HANDLE_VALUE )
 		{
 		FreeLibrary(dll);
-		DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+		DSOerr(DSO_F_WIN32_GLOBALLOOKUP,DSO_R_UNSUPPORTED);
 		return NULL;
 		}