Fix source where indent will not be able to cope

[oweals/openssl.git] / crypto / bio / bio_cb.c

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 6f4254a1141a03a400d85ac4b8f5cd1e96d8ae0c..dd21d02468b2229a098f75d646e75243b591a124 100644 (file)
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -63,7 +63,7 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 
-long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
+long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
             int argi, long argl, long ret)
        {
        BIO *b;
@@ -85,28 +85,32 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
                break;
        case BIO_CB_READ:
                if (bio->method->type & BIO_TYPE_DESCRIPTOR)
-                       BIO_snprintf(p,p_maxlen,"read(%d,%d) - %s fd=%d\n",
-                                bio->num,argi,bio->method->name,bio->num);
+                       BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n",
+                                bio->num,(unsigned long)argi,
+                                bio->method->name,bio->num);
                else
-                       BIO_snprintf(p,p_maxlen,"read(%d,%d) - %s\n",
-                                bio->num,argi,bio->method->name);
+                       BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s\n",
+                                bio->num,(unsigned long)argi,
+                                bio->method->name);
                break;
        case BIO_CB_WRITE:
                if (bio->method->type & BIO_TYPE_DESCRIPTOR)
-                       BIO_snprintf(p,p_maxlen,"write(%d,%d) - %s fd=%d\n",
-                                bio->num,argi,bio->method->name,bio->num);
+                       BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n",
+                                bio->num,(unsigned long)argi,
+                                bio->method->name,bio->num);
                else
-                       BIO_snprintf(p,p_maxlen,"write(%d,%d) - %s\n",
-                                bio->num,argi,bio->method->name);
+                       BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s\n",
+                                bio->num,(unsigned long)argi,
+                                bio->method->name);
                break;
        case BIO_CB_PUTS:
                BIO_snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name);
                break;
        case BIO_CB_GETS:
-               BIO_snprintf(p,p_maxlen,"gets(%d) - %s\n",argi,bio->method->name);
+               BIO_snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name);
                break;
        case BIO_CB_CTRL:
-               BIO_snprintf(p,p_maxlen,"ctrl(%d) - %s\n",argi,bio->method->name);
+               BIO_snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name);
                break;
        case BIO_CB_RETURN|BIO_CB_READ:
                BIO_snprintf(p,p_maxlen,"read return %ld\n",ret);
@@ -131,7 +135,7 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
        b=(BIO *)bio->cb_arg;
        if (b != NULL)
                BIO_write(b,buf,strlen(buf));
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
+#if !defined(OPENSSL_NO_STDIO)
        else
                fputs(buf,stderr);
 #endif