X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdso%2Fdso.h;h=aa721f7febb603ab5eebb94f1182bf79cda53715;hb=003144a8e8ed5c6c4aaee6e227773bb3d6bc0f9d;hp=8c495b1b247d3dce0cbcf83cd764bb8c9ddeef3d;hpb=d9efa3616a46c4f5ab10ee54ae8b68061774bf2b;p=oweals%2Fopenssl.git

diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index 8c495b1b24..aa721f7feb 100644
--- 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. */
@@ -262,12 +261,11 @@ DSO_METHOD *DSO_METHOD_win32(void);
 /* If VMS is defined, use shared images. If not, return NULL. */
 DSO_METHOD *DSO_METHOD_vms(void);
 
-void ERR_load_DSO_strings(void);
-
 /* BEGIN ERROR CODES */
 /* 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 +291,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 +320,3 @@ void ERR_load_DSO_strings(void);
 }
 #endif
 #endif
-