gcc complained about "write" being shadowed even though the "write"

variable name occured just in a function *prototype* -- so rename it

diff --git a/ssl/ssl.h b/ssl/ssl.h
index b4a3543d14666e2c0173ebeb530aa80162d49ce7..f364240fbabccd9fa58ef5d4707e10dda9fec1e2 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -586,7 +586,7 @@ struct ssl_ctx_st
        int read_ahead;
 
        /* callback that allows applications to peek at protocol messages */
        int read_ahead;
 
        /* callback that allows applications to peek at protocol messages */

-       void (*msg_callback)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg);
+       void (*msg_callback)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg);

        void *msg_callback_arg;
 
        int verify_mode;
        void *msg_callback_arg;
 
        int verify_mode;


@@ -732,7 +732,7 @@ struct ssl_st
                                 * (for non-blocking reads) */
 
        /* callback that allows applications to peek at protocol messages */
                                 * (for non-blocking reads) */
 
        /* callback that allows applications to peek at protocol messages */

-       void (*msg_callback)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg);
+       void (*msg_callback)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg);

        void *msg_callback_arg;
 
        int hit;                /* reusing a previous session */
        void *msg_callback_arg;
 
        int hit;                /* reusing a previous session */

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 67fccc512b41cdb0ba29328f92b332e4e94954b1..1a434a5cb5a763064a0b91e549cf7163a569eaee 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -939,7 +939,7 @@ long SSL_callback_ctrl(SSL *s, int cmd, void (*fp)())
        switch(cmd)
                {
        case SSL_CTRL_SET_MSG_CALLBACK:
        switch(cmd)
                {
        case SSL_CTRL_SET_MSG_CALLBACK:

-               s->msg_callback = (void (*)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp);
+               s->msg_callback = (void (*)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp);

                return 1;
                
        default:
                return 1;
                
        default:


@@ -1027,7 +1027,7 @@ long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
        switch(cmd)
                {
        case SSL_CTRL_SET_MSG_CALLBACK:
        switch(cmd)
                {
        case SSL_CTRL_SET_MSG_CALLBACK:

-               ctx->msg_callback = (void (*)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp);
+               ctx->msg_callback = (void (*)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp);

                return 1;
 
        default:
                return 1;
 
        default: