Commit 31fe950d authored by Bodo Möller's avatar Bodo Möller
Browse files

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

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

ssl/ssl.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

ssl/ssl_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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: