Bug 5094 - Code cleanup, patch by Zack Middleton and DevHC. Fixes unused-but-set gcc warnings
This commit is contained in:
parent
1ea7ab1f42
commit
23f6fd1633
85 changed files with 246 additions and 496 deletions
|
@ -1073,7 +1073,6 @@ NET_OpenSocks
|
|||
*/
|
||||
void NET_OpenSocks( int port ) {
|
||||
struct sockaddr_in address;
|
||||
int err;
|
||||
struct hostent *h;
|
||||
int len;
|
||||
qboolean rfc1929;
|
||||
|
@ -1084,14 +1083,12 @@ void NET_OpenSocks( int port ) {
|
|||
Com_Printf( "Opening connection to SOCKS server.\n" );
|
||||
|
||||
if ( ( socks_socket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ) ) == INVALID_SOCKET ) {
|
||||
err = socketError;
|
||||
Com_Printf( "WARNING: NET_OpenSocks: socket: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
||||
h = gethostbyname( net_socksServer->string );
|
||||
if ( h == NULL ) {
|
||||
err = socketError;
|
||||
Com_Printf( "WARNING: NET_OpenSocks: gethostbyname: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1104,7 +1101,6 @@ void NET_OpenSocks( int port ) {
|
|||
address.sin_port = htons( (short)net_socksPort->integer );
|
||||
|
||||
if ( connect( socks_socket, (struct sockaddr *)&address, sizeof( address ) ) == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: connect: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1132,7 +1128,6 @@ void NET_OpenSocks( int port ) {
|
|||
buf[2] = 2; // method #2 - method id #02: username/password
|
||||
}
|
||||
if ( send( socks_socket, (void *)buf, len, 0 ) == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1140,7 +1135,6 @@ void NET_OpenSocks( int port ) {
|
|||
// get the response
|
||||
len = recv( socks_socket, (void *)buf, 64, 0 );
|
||||
if ( len == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1179,7 +1173,6 @@ void NET_OpenSocks( int port ) {
|
|||
|
||||
// send it
|
||||
if ( send( socks_socket, (void *)buf, 3 + ulen + plen, 0 ) == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1187,7 +1180,6 @@ void NET_OpenSocks( int port ) {
|
|||
// get the response
|
||||
len = recv( socks_socket, (void *)buf, 64, 0 );
|
||||
if ( len == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1209,7 +1201,6 @@ void NET_OpenSocks( int port ) {
|
|||
*(int *)&buf[4] = INADDR_ANY;
|
||||
*(short *)&buf[8] = htons( (short)port ); // port
|
||||
if ( send( socks_socket, (void *)buf, 10, 0 ) == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
@ -1217,7 +1208,6 @@ void NET_OpenSocks( int port ) {
|
|||
// get the response
|
||||
len = recv( socks_socket, (void *)buf, 64, 0 );
|
||||
if( len == SOCKET_ERROR ) {
|
||||
err = socketError;
|
||||
Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue