DSO_ctrl() changes have removed a couple of DSO_METHOD-specific functions

so I've regenerated the error numbers and strings for the DSO functions.

diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index bed7c464a647eccc1a9a880494f1ebd6606a019e..2770e3b7634aac91b223bfcafa3a1dc4cba9a399 100644 (file)
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -206,40 +206,35 @@ void ERR_load_DSO_strings(void);
 /* Function codes. */
 #define DSO_F_DLFCN_BIND_FUNC                           100
 #define DSO_F_DLFCN_BIND_VAR                            101
 /* Function codes. */
 #define DSO_F_DLFCN_BIND_FUNC                           100
 #define DSO_F_DLFCN_BIND_VAR                            101

-#define DSO_F_DLFCN_CTRL                                102
-#define DSO_F_DLFCN_LOAD                                103
-#define DSO_F_DLFCN_UNLOAD                              104
-#define DSO_F_DL_BIND_FUNC                              105
-#define DSO_F_DL_BIND_VAR                               106
-#define DSO_F_DL_CTRL                                   107
-#define DSO_F_DL_LOAD                                   108
-#define DSO_F_DL_UNLOAD                                         109
-#define DSO_F_DSO_BIND_FUNC                             110
-#define DSO_F_DSO_BIND_VAR                              111
-#define DSO_F_DSO_CTRL                                  112
-#define DSO_F_DSO_FREE                                  113
-#define DSO_F_DSO_LOAD                                  114
-#define DSO_F_DSO_NEW_METHOD                            115
-#define DSO_F_DSO_UP                                    116
-#define DSO_F_VMS_BIND_VAR                              122
-#define DSO_F_VMS_CTRL                                  123
-#define DSO_F_VMS_LOAD                                  124
-#define DSO_F_VMS_UNLOAD                                125
-#define DSO_F_WIN32_BIND_FUNC                           117
-#define DSO_F_WIN32_BIND_VAR                            118
-#define DSO_F_WIN32_CTRL                                119
+#define DSO_F_DLFCN_LOAD                                102
+#define DSO_F_DLFCN_UNLOAD                              103
+#define DSO_F_DL_BIND_FUNC                              104
+#define DSO_F_DL_BIND_VAR                               105
+#define DSO_F_DL_LOAD                                   106
+#define DSO_F_DL_UNLOAD                                         107
+#define DSO_F_DSO_BIND_FUNC                             108
+#define DSO_F_DSO_BIND_VAR                              109
+#define DSO_F_DSO_CTRL                                  110
+#define DSO_F_DSO_FREE                                  111
+#define DSO_F_DSO_LOAD                                  112
+#define DSO_F_DSO_NEW_METHOD                            113
+#define DSO_F_DSO_UP                                    114
+#define DSO_F_VMS_BIND_VAR                              115
+#define DSO_F_VMS_LOAD                                  116
+#define DSO_F_VMS_UNLOAD                                117
+#define DSO_F_WIN32_BIND_FUNC                           118
+#define DSO_F_WIN32_BIND_VAR                            119

 #define DSO_F_WIN32_LOAD                                120
 #define DSO_F_WIN32_UNLOAD                              121
 
 /* Reason codes. */
 #define DSO_R_CTRL_FAILED                               100
 #define DSO_F_WIN32_LOAD                                120
 #define DSO_F_WIN32_UNLOAD                              121
 
 /* Reason codes. */
 #define DSO_R_CTRL_FAILED                               100

-#define DSO_R_FILENAME_TOO_BIG                          109
-#define DSO_R_FINISH_FAILED                             101
-#define DSO_R_LOAD_FAILED                               102
-#define DSO_R_NULL_HANDLE                               103
-#define DSO_R_STACK_ERROR                               104
-#define DSO_R_SYM_FAILURE                               105
-#define DSO_R_UNKNOWN_COMMAND                           106
+#define DSO_R_FILENAME_TOO_BIG                          101
+#define DSO_R_FINISH_FAILED                             102
+#define DSO_R_LOAD_FAILED                               103
+#define DSO_R_NULL_HANDLE                               104
+#define DSO_R_STACK_ERROR                               105
+#define DSO_R_SYM_FAILURE                               106

 #define DSO_R_UNLOAD_FAILED                             107
 #define DSO_R_UNSUPPORTED                               108
 
 #define DSO_R_UNLOAD_FAILED                             107
 #define DSO_R_UNSUPPORTED                               108
 

diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index a3d7321c9b8f89da5d035627b3345b273d32e6d0..a9b758d1c995450c503e1165c586eb9ee2d56e1c 100644 (file)
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -68,12 +68,10 @@ static ERR_STRING_DATA DSO_str_functs[]=
        {
 {ERR_PACK(0,DSO_F_DLFCN_BIND_FUNC,0),  "DLFCN_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_DLFCN_BIND_VAR,0),   "DLFCN_BIND_VAR"},
        {
 {ERR_PACK(0,DSO_F_DLFCN_BIND_FUNC,0),  "DLFCN_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_DLFCN_BIND_VAR,0),   "DLFCN_BIND_VAR"},

-{ERR_PACK(0,DSO_F_DLFCN_CTRL,0),       "DLFCN_CTRL"},

 {ERR_PACK(0,DSO_F_DLFCN_LOAD,0),       "DLFCN_LOAD"},
 {ERR_PACK(0,DSO_F_DLFCN_UNLOAD,0),     "DLFCN_UNLOAD"},
 {ERR_PACK(0,DSO_F_DL_BIND_FUNC,0),     "DL_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_DL_BIND_VAR,0),      "DL_BIND_VAR"},
 {ERR_PACK(0,DSO_F_DLFCN_LOAD,0),       "DLFCN_LOAD"},
 {ERR_PACK(0,DSO_F_DLFCN_UNLOAD,0),     "DLFCN_UNLOAD"},
 {ERR_PACK(0,DSO_F_DL_BIND_FUNC,0),     "DL_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_DL_BIND_VAR,0),      "DL_BIND_VAR"},

-{ERR_PACK(0,DSO_F_DL_CTRL,0),  "DL_CTRL"},

 {ERR_PACK(0,DSO_F_DL_LOAD,0),  "DL_LOAD"},
 {ERR_PACK(0,DSO_F_DL_UNLOAD,0),        "DL_UNLOAD"},
 {ERR_PACK(0,DSO_F_DSO_BIND_FUNC,0),    "DSO_bind_func"},
 {ERR_PACK(0,DSO_F_DL_LOAD,0),  "DL_LOAD"},
 {ERR_PACK(0,DSO_F_DL_UNLOAD,0),        "DL_UNLOAD"},
 {ERR_PACK(0,DSO_F_DSO_BIND_FUNC,0),    "DSO_bind_func"},


@@ -84,12 +82,10 @@ static ERR_STRING_DATA DSO_str_functs[]=
 {ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0),   "DSO_new_method"},
 {ERR_PACK(0,DSO_F_DSO_UP,0),   "DSO_up"},
 {ERR_PACK(0,DSO_F_VMS_BIND_VAR,0),     "VMS_BIND_VAR"},
 {ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0),   "DSO_new_method"},
 {ERR_PACK(0,DSO_F_DSO_UP,0),   "DSO_up"},
 {ERR_PACK(0,DSO_F_VMS_BIND_VAR,0),     "VMS_BIND_VAR"},

-{ERR_PACK(0,DSO_F_VMS_CTRL,0), "VMS_CTRL"},

 {ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"},
 {ERR_PACK(0,DSO_F_VMS_UNLOAD,0),       "VMS_UNLOAD"},
 {ERR_PACK(0,DSO_F_WIN32_BIND_FUNC,0),  "WIN32_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_WIN32_BIND_VAR,0),   "WIN32_BIND_VAR"},
 {ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"},
 {ERR_PACK(0,DSO_F_VMS_UNLOAD,0),       "VMS_UNLOAD"},
 {ERR_PACK(0,DSO_F_WIN32_BIND_FUNC,0),  "WIN32_BIND_FUNC"},
 {ERR_PACK(0,DSO_F_WIN32_BIND_VAR,0),   "WIN32_BIND_VAR"},

-{ERR_PACK(0,DSO_F_WIN32_CTRL,0),       "WIN32_CTRL"},

 {ERR_PACK(0,DSO_F_WIN32_LOAD,0),       "WIN32_LOAD"},
 {ERR_PACK(0,DSO_F_WIN32_UNLOAD,0),     "WIN32_UNLOAD"},
 {0,NULL}
 {ERR_PACK(0,DSO_F_WIN32_LOAD,0),       "WIN32_LOAD"},
 {ERR_PACK(0,DSO_F_WIN32_UNLOAD,0),     "WIN32_UNLOAD"},
 {0,NULL}


@@ -104,7 +100,6 @@ static ERR_STRING_DATA DSO_str_reasons[]=
 {DSO_R_NULL_HANDLE                       ,"a null shared library handle was used"},
 {DSO_R_STACK_ERROR                       ,"the meth_data stack is corrupt"},
 {DSO_R_SYM_FAILURE                       ,"could not bind to the requested symbol name"},
 {DSO_R_NULL_HANDLE                       ,"a null shared library handle was used"},
 {DSO_R_STACK_ERROR                       ,"the meth_data stack is corrupt"},
 {DSO_R_SYM_FAILURE                       ,"could not bind to the requested symbol name"},

-{DSO_R_UNKNOWN_COMMAND                   ,"unknown control command"},

 {DSO_R_UNLOAD_FAILED                     ,"could not unload the shared library"},
 {DSO_R_UNSUPPORTED                       ,"functionality not supported"},
 {0,NULL}
 {DSO_R_UNLOAD_FAILED                     ,"could not unload the shared library"},
 {DSO_R_UNSUPPORTED                       ,"functionality not supported"},
 {0,NULL}