X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fex_data.c;h=176574766b838f893c019e0e46f4a29848889db7;hb=b25c8db87245e00cf3749067503a08c0ed3b769a;hp=42b8b9d1baeabc99b58b52f9932807027740c07e;hpb=dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c;p=oweals%2Fopenssl.git

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 42b8b9d1ba..176574766b 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -58,19 +58,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "buffer.h"
-#include "bio.h"
-#include "lhash.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
 #include "cryptlib.h"
 
-int CRYPTO_get_ex_new_index(idx,skp,argl,argp,new_func,dup_func,free_func)
-int idx;
-STACK **skp;
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
+int CRYPTO_get_ex_new_index(int idx, STACK **skp, long argl, char *argp,
+	     int (*new_func)(), int (*dup_func)(), void (*free_func)())
 	{
 	int ret= -1;
 	CRYPTO_EX_DATA_FUNCS *a;
@@ -103,17 +97,14 @@ void (*free_func)();
 			goto err;
 			}
 		}
-	sk_value(*skp,idx)=(char *)a;
+	sk_set(*skp,idx, (char *)a);
 	ret=idx;
 err:
 	MemCheck_on();
 	return(idx);
 	}
 
-int CRYPTO_set_ex_data(ad,idx,val)
-CRYPTO_EX_DATA *ad;
-int idx;
-char *val;
+int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, char *val)
 	{
 	int i;
 
@@ -136,13 +127,11 @@ char *val;
 			}
 		i++;
 		}
-	sk_value(ad->sk,idx)=val;
+	sk_set(ad->sk,idx,val);
 	return(1);
 	}
 
-char *CRYPTO_get_ex_data(ad,idx)
-CRYPTO_EX_DATA *ad;
-int idx;
+char *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad, int idx)
 	{
 	if (ad->sk == NULL)
 		return(0);
@@ -152,13 +141,12 @@ int idx;
 		return(sk_value(ad->sk,idx));
 	}
 
-/* The callback is called with the 'object', which is the origional data object
+/* The callback is called with the 'object', which is the original data object
  * being duplicated, a pointer to the
  * 'new' object to be inserted, the index, and the argi/argp
  */
-int CRYPTO_dup_ex_data(meth,to,from)
-STACK *meth;
-CRYPTO_EX_DATA *to,*from;
+int CRYPTO_dup_ex_data(STACK *meth, CRYPTO_EX_DATA *to,
+	     CRYPTO_EX_DATA *from)
 	{
 	int i,j,m,r;
 	CRYPTO_EX_DATA_FUNCS *mm;
@@ -184,10 +172,7 @@ CRYPTO_EX_DATA *to,*from;
 	}
 
 /* Call each free callback */
-void CRYPTO_free_ex_data(meth,obj,ad)
-STACK *meth;
-char *obj;
-CRYPTO_EX_DATA *ad;
+void CRYPTO_free_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
 	{
 	CRYPTO_EX_DATA_FUNCS *m;
 	char *ptr;
@@ -213,10 +198,7 @@ CRYPTO_EX_DATA *ad;
 		}
 	}
 
-void CRYPTO_new_ex_data(meth,obj,ad)
-STACK *meth;
-char *obj;
-CRYPTO_EX_DATA *ad;
+void CRYPTO_new_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
 	{
 	CRYPTO_EX_DATA_FUNCS *m;
 	char *ptr;