OPENSSL_NO_SOCK fixes [from HEAD].

[openssl.git] / crypto / bio / bio_lib.c

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index ea7f22a8ce18bbc76cb0489283c4f6609455c7a4..9c9646afa8a22c3a6a208877c76e7f92d8458f31 100644 (file)
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -110,7 +110,7 @@ int BIO_set(BIO *bio, BIO_METHOD *method)
 
 int BIO_free(BIO *a)
        {
-       int ret=0,i;
+       int i;
 
        if (a == NULL) return(0);
 
@@ -133,7 +133,7 @@ int BIO_free(BIO *a)
        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
        if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-       ret=a->method->destroy(a);
+       a->method->destroy(a);
        OPENSSL_free(a);
        return(1);
        }
@@ -156,14 +156,12 @@ void      BIO_set_flags(BIO *b, int flags)
        b->flags |= flags;
        }
 
-long (*BIO_get_callback(const BIO *b))(struct bio_st *, int, const char *,
-                                      size_t, long, long)
+long (*BIO_get_callback(const BIO *b))(struct bio_st *,int,const char *,int, long,long)
        {
        return b->callback;
        }
 
-void BIO_set_callback(BIO *b, long (*cb)(struct bio_st *, int, const char *,
-                                        size_t, long, long))
+void BIO_set_callback(BIO *b, long (*cb)(struct bio_st *,int,const char *,int, long,long))
        {
        b->callback = cb;
        }
@@ -192,7 +190,7 @@ int BIO_method_type(const BIO *b)
 int BIO_read(BIO *b, void *out, int outl)
        {
        int i;
-       long (*cb)(BIO *, int, const char *, size_t, long, long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if ((b == NULL) || (b->method == NULL) || (b->method->bread == NULL))
                {
@@ -221,10 +219,10 @@ int BIO_read(BIO *b, void *out, int outl)
        return(i);
        }
 
-int BIO_write(BIO *b, const void *in, size_t inl)
+int BIO_write(BIO *b, const void *in, int inl)
        {
        int i;
-       long (*cb)(BIO *,int,const char *,size_t,long,long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if (b == NULL)
                return(0);
@@ -237,7 +235,7 @@ int BIO_write(BIO *b, const void *in, size_t inl)
                }
 
        if ((cb != NULL) &&
-               ((i=cb(b,BIO_CB_WRITE,in,inl,0L,1L)) <= 0))
+               ((i=(int)cb(b,BIO_CB_WRITE,in,inl,0L,1L)) <= 0))
                        return(i);
 
        if (!b->init)
@@ -259,7 +257,7 @@ int BIO_write(BIO *b, const void *in, size_t inl)
 int BIO_puts(BIO *b, const char *in)
        {
        int i;
-       long (*cb)(BIO *, int, const char *, size_t, long, long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if ((b == NULL) || (b->method == NULL) || (b->method->bputs == NULL))
                {
@@ -292,7 +290,7 @@ int BIO_puts(BIO *b, const char *in)
 int BIO_gets(BIO *b, char *in, int inl)
        {
        int i;
-       long (*cb)(BIO *, int, const char *, size_t, long, long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if ((b == NULL) || (b->method == NULL) || (b->method->bgets == NULL))
                {
@@ -353,7 +351,7 @@ char *BIO_ptr_ctrl(BIO *b, int cmd, long larg)
 long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
        {
        long ret;
-       long (*cb)(BIO *, int, const char *, size_t, long, long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if (b == NULL) return(0);
 
@@ -380,7 +378,7 @@ long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
 long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long))
        {
        long ret;
-       long (*cb)(BIO *, int, const char *, size_t, long, long);
+       long (*cb)(BIO *,int,const char *,int,long,long);
 
        if (b == NULL) return(0);
 
@@ -431,7 +429,7 @@ BIO *BIO_push(BIO *b, BIO *bio)
        if (bio != NULL)
                bio->prev_bio=lb;
        /* called to do internal processing */
-       BIO_ctrl(b,BIO_CTRL_PUSH,0,NULL);
+       BIO_ctrl(b,BIO_CTRL_PUSH,0,lb);
        return(b);
        }
 
@@ -443,7 +441,7 @@ BIO *BIO_pop(BIO *b)
        if (b == NULL) return(NULL);
        ret=b->next_bio;
 
-       BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
+       BIO_ctrl(b,BIO_CTRL_POP,0,b);
 
        if (b->prev_bio != NULL)
                b->prev_bio->next_bio=b->next_bio;
@@ -523,40 +521,40 @@ void BIO_free_all(BIO *bio)
 
 BIO *BIO_dup_chain(BIO *in)
        {
-       BIO *ret=NULL,*eoc=NULL,*bio,*new;
+       BIO *ret=NULL,*eoc=NULL,*bio,*new_bio;
 
        for (bio=in; bio != NULL; bio=bio->next_bio)
                {
-               if ((new=BIO_new(bio->method)) == NULL) goto err;
-               new->callback=bio->callback;
-               new->cb_arg=bio->cb_arg;
-               new->init=bio->init;
-               new->shutdown=bio->shutdown;
-               new->flags=bio->flags;
+               if ((new_bio=BIO_new(bio->method)) == NULL) goto err;
+               new_bio->callback=bio->callback;
+               new_bio->cb_arg=bio->cb_arg;
+               new_bio->init=bio->init;
+               new_bio->shutdown=bio->shutdown;
+               new_bio->flags=bio->flags;
 
                /* This will let SSL_s_sock() work with stdin/stdout */
-               new->num=bio->num;
+               new_bio->num=bio->num;
 
-               if (!BIO_dup_state(bio,(char *)new))
+               if (!BIO_dup_state(bio,(char *)new_bio))
                        {
-                       BIO_free(new);
+                       BIO_free(new_bio);
                        goto err;
                        }
 
                /* copy app data */
-               if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new->ex_data,
+               if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
                                        &bio->ex_data))
                        goto err;
 
                if (ret == NULL)
                        {
-                       eoc=new;
+                       eoc=new_bio;
                        ret=eoc;
                        }
                else
                        {
-                       BIO_push(eoc,new);
-                       eoc=new;
+                       BIO_push(eoc,new_bio);
+                       eoc=new_bio;
                        }
                }
        return(ret);