"make depend"

[oweals/openssl.git] / crypto / evp / bio_b64.c

diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index 73172b9a07119bbc29b0e10c458d2e91fa1e76dd..f9d434b2997f9dae88abd830c19e173a8564a4e3 100644 (file)
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
 #ifndef NOPROTO
 static int b64_write(BIO *h,char *buf,int num);
@@ -113,13 +113,12 @@ static BIO_METHOD methods_b64=
        b64_free,
        };
 
-BIO_METHOD *BIO_f_base64()
+BIO_METHOD *BIO_f_base64(void)
        {
        return(&methods_b64);
        }
 
-static int b64_new(bi)
-BIO *bi;
+static int b64_new(BIO *bi)
        {
        BIO_B64_CTX *ctx;
 
@@ -140,8 +139,7 @@ BIO *bi;
        return(1);
        }
 
-static int b64_free(a)
-BIO *a;
+static int b64_free(BIO *a)
        {
        if (a == NULL) return(0);
        Free(a->ptr);
@@ -151,10 +149,7 @@ BIO *a;
        return(1);
        }
        
-static int b64_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int b64_read(BIO *b, char *out, int outl)
        {
        int ret=0,i,ii,j,k,x,n,num,ret_code=0;
        BIO_B64_CTX *ctx;
@@ -354,10 +349,7 @@ int outl;
        return((ret == 0)?ret_code:ret);
        }
 
-static int b64_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int b64_write(BIO *b, char *in, int inl)
        {
        int ret=inl,n,i;
        BIO_B64_CTX *ctx;
@@ -451,11 +443,7 @@ int inl;
        return(ret);
        }
 
-static long b64_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long b64_ctrl(BIO *b, int cmd, long num, char *ptr)
        {
        BIO_B64_CTX *ctx;
        long ret=1;