From: Bodo Möller <bodo@openssl.org>
Date: Wed, 17 Oct 2001 20:44:25 +0000 (+0000)
Subject: gcc complained about "write" being shadowed even though the "write"
X-Git-Tag: OpenSSL_0_9_6c~26^2~113
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=31fe950d2b3fad3ac7ca2922c2af2104514a9496;ds=sidebyside

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 b4a3543d14..f364240fba 100644
--- 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 */
-	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;
@@ -732,7 +732,7 @@ struct ssl_st
 	               	 	 * (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 */
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 67fccc512b..1a434a5cb5 100644
--- 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:
-		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:
@@ -1027,7 +1027,7 @@ long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
 	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: