'flags' should only be set inside DSO_load() if constructing a new DSO

[openssl.git] / crypto / dso / dso.h

diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index 8c495b1b247d3dce0cbcf83cd764bb8c9ddeef3d..a1678454a5ad6f6d0bacb498e367f53a83d05c26 100644 (file)
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -187,7 +187,7 @@ DSO *       DSO_new(void);
 DSO *  DSO_new_method(DSO_METHOD *method);
 int    DSO_free(DSO *dso);
 int    DSO_flags(DSO *dso);
-int    DSO_up(DSO *dso);
+int    DSO_up_ref(DSO *dso);
 long   DSO_ctrl(DSO *dso, int cmd, long larg, void *parg);
 
 /* This function sets the DSO's name_converter callback. If it is non-NULL,
@@ -227,8 +227,7 @@ DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth);
  * for the first and third parameters. Use DSO_up and DSO_free for
  * subsequent reference count handling. Any flags passed in will be set
  * in the constructed DSO after its init() function but before the
- * load operation. This will be done with;
- *    DSO_ctrl(dso, DSO_CTRL_SET_FLAGS, flags, NULL); */
+ * load operation. If 'dso' is non-NULL, 'flags' is ignored. */
 DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags);
 
 /* This function binds to a variable inside a shared library. */
@@ -268,6 +267,7 @@ void ERR_load_DSO_strings(void);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_DSO_strings(void);
 
 /* Error codes for the DSO functions. */
 
@@ -293,7 +293,7 @@ void ERR_load_DSO_strings(void);
 #define DSO_F_DSO_NEW_METHOD                            113
 #define DSO_F_DSO_SET_FILENAME                          129
 #define DSO_F_DSO_SET_NAME_CONVERTER                    122
-#define DSO_F_DSO_UP                                    114
+#define DSO_F_DSO_UP_REF                                114
 #define DSO_F_VMS_BIND_VAR                              115
 #define DSO_F_VMS_LOAD                                  116
 #define DSO_F_VMS_UNLOAD                                117
@@ -322,4 +322,3 @@ void ERR_load_DSO_strings(void);
 }
 #endif
 #endif
-