generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
variable name occured just in a function *prototype* -- so rename it
This commit is contained in:
Bodo Möller 2001-10-17 20:44:25 +00:00
parent db6a87d8cc
commit 31fe950d2b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssl.h
View File

@ -586,7 +586,7 @@ struct ssl_ctx_st
int read_ahead; int read_ahead;
/* callback that allows applications to peek at protocol messages */ /* 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; void *msg_callback_arg;
int verify_mode; int verify_mode;
@ -732,7 +732,7 @@ struct ssl_st
* (for non-blocking reads) */ * (for non-blocking reads) */
/* callback that allows applications to peek at protocol messages */ /* 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; void *msg_callback_arg;
int hit; /* reusing a previous session */ int hit; /* reusing a previous session */

4
ssl/ssl_lib.c
View File

@ -939,7 +939,7 @@ long SSL_callback_ctrl(SSL *s, int cmd, void (*fp)())
switch(cmd) switch(cmd)
{ {
case SSL_CTRL_SET_MSG_CALLBACK: 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; return 1;
default: default:
@ -1027,7 +1027,7 @@ long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
switch(cmd) switch(cmd)
{ {
case SSL_CTRL_SET_MSG_CALLBACK: 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; return 1;
default: default: