quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make C code to compile with -std=c11 (though still many implicit function declarations)

Browse Source
This commit is contained in:
Garux 2020-02-07 22:45:06 +03:00
parent 70b6cc8696
commit 1805e42582
10 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/l_net/l_net_berkley.c
View File

@ -200,7 +200,7 @@ int WINS_Init( void ){
( (struct sockaddr_in *)&broadcastaddr )->sin_family = AF_INET;
( (struct sockaddr_in *)&broadcastaddr )->sin_addr.s_addr = INADDR_BROADCAST;
( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (unsigned short)net_hostport );
WINS_GetSocketAddr( net_controlsocket, &addr );
strcpy( my_tcpip_address, WINS_AddrToString( &addr ) );
@ -268,7 +268,7 @@ void WINS_Shutdown( void ){
int WINS_OpenSocket( int port ){
int newsocket;
struct sockaddr_in address;
u_long _true = 1;
unsigned long _true = 1;
if ( ( newsocket = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == SOCKET_ERROR ) {
WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
@ -284,7 +284,7 @@ int WINS_OpenSocket( int port ){
memset( (char *) &address, 0, sizeof( address ) );
address.sin_family = AF_INET;
address.sin_addr.s_addr = INADDR_ANY;
address.sin_port = htons( (u_short)port );
address.sin_port = htons( (unsigned short)port );
if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) {
WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
closesocket( newsocket );
@ -314,7 +314,7 @@ int WINS_OpenReliableSocket( int port ){
memset( (char *) &address, 0, sizeof( address ) );
address.sin_family = AF_INET;
address.sin_addr.s_addr = htonl( INADDR_ANY );
address.sin_port = htons( (u_short)port );
address.sin_port = htons( (unsigned short)port );
if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) {
WinPrint( "WINS_OpenReliableSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
closesocket( newsocket );
@ -336,7 +336,7 @@ int WINS_OpenReliableSocket( int port ){
// Changes Globals: -
//===========================================================================
int WINS_Listen( int socket ){
u_long _true = 1;
unsigned long _true = 1;
if ( ioctlsocket( socket, FIONBIO, &_true ) == -1 ) {
WinPrint( "WINS_Listen: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
@ -430,7 +430,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){
}
hostaddr->sa_family = AF_INET;
( (struct sockaddr_in *)hostaddr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)hostaddr )->sin_port = htons( (unsigned short)net_hostport );
( (struct sockaddr_in *)hostaddr )->sin_addr.s_addr = ( myAddr & htonl( mask ) ) | htonl( addr );
return 0;
@ -443,7 +443,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){
//===========================================================================
int WINS_Connect( int socket, struct sockaddr_s *addr ){
int ret;
u_long _true2 = 0xFFFFFFFF;
unsigned long _true2 = 0xFFFFFFFF;
ret = connect( socket, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
if ( ret == SOCKET_ERROR ) {
@ -621,7 +621,7 @@ int WINS_StringToAddr( char *string, struct sockaddr_s *addr ){
addr->sa_family = AF_INET;
( (struct sockaddr_in *)addr )->sin_addr.s_addr = htonl( ipaddr );
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)hp );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)hp );
return 0;
} //end of the function WINS_StringToAddr
//===========================================================================
@ -680,7 +680,7 @@ int WINS_GetAddrFromName( char *name, struct sockaddr_s *addr ){
}
addr->sa_family = AF_INET;
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)net_hostport );
( (struct sockaddr_in *)addr )->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0];
return 0;
@ -722,6 +722,6 @@ int WINS_GetSocketPort( struct sockaddr_s *addr ){
// Changes Globals: -
//===========================================================================
int WINS_SetSocketPort( struct sockaddr_s *addr, int port ){
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)port );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)port );
return 0;
} //end of the function WINS_SetSocketPort

20
libs/l_net/l_net_wins.c
View File

@ -221,7 +221,7 @@ int WINS_Init( void ){
( (struct sockaddr_in *)&broadcastaddr )->sin_family = AF_INET;
( (struct sockaddr_in *)&broadcastaddr )->sin_addr.s_addr = INADDR_BROADCAST;
( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)&broadcastaddr )->sin_port = htons( (unsigned short)net_hostport );
WINS_GetSocketAddr( net_controlsocket, &addr );
strcpy( my_tcpip_address, WINS_AddrToString( &addr ) );
@ -289,7 +289,7 @@ void WINS_Shutdown( void ){
int WINS_OpenSocket( int port ){
int newsocket;
struct sockaddr_in address;
u_long _true = 1;
unsigned long _true = 1;
if ( ( newsocket = socket( PF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == -1 ) {
WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
@ -305,7 +305,7 @@ int WINS_OpenSocket( int port ){
memset( (char *) &address, 0, sizeof( address ) );
address.sin_family = AF_INET;
address.sin_addr.s_addr = INADDR_ANY;
address.sin_port = htons( (u_short)port );
address.sin_port = htons( (unsigned short)port );
if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) {
WinPrint( "WINS_OpenSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
closesocket( newsocket );
@ -335,7 +335,7 @@ int WINS_OpenReliableSocket( int port ){
memset( (char *) &address, 0, sizeof( address ) );
address.sin_family = AF_INET;
address.sin_addr.s_addr = htonl( INADDR_ANY );
address.sin_port = htons( (u_short)port );
address.sin_port = htons( (unsigned short)port );
if ( bind( newsocket, (void *)&address, sizeof( address ) ) == -1 ) {
WinPrint( "WINS_OpenReliableSocket: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
closesocket( newsocket );
@ -357,7 +357,7 @@ int WINS_OpenReliableSocket( int port ){
// Changes Globals: -
//===========================================================================
int WINS_Listen( int socket ){
u_long _true = 1;
unsigned long _true = 1;
if ( ioctlsocket( socket, FIONBIO, &_true ) == -1 ) {
WinPrint( "WINS_Listen: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
@ -451,7 +451,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){
}
hostaddr->sa_family = AF_INET;
( (struct sockaddr_in *)hostaddr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)hostaddr )->sin_port = htons( (unsigned short)net_hostport );
( (struct sockaddr_in *)hostaddr )->sin_addr.s_addr = ( myAddr & htonl( mask ) ) | htonl( addr );
return 0;
@ -464,7 +464,7 @@ static int PartialIPAddress( char *in, struct sockaddr_s *hostaddr ){
//===========================================================================
int WINS_Connect( int socket, struct sockaddr_s *addr ){
int ret;
u_long _true2 = 0xFFFFFFFF;
unsigned long _true2 = 0xFFFFFFFF;
ret = connect( socket, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
if ( ret == SOCKET_ERROR ) {
@ -635,7 +635,7 @@ int WINS_StringToAddr( char *string, struct sockaddr_s *addr ){
addr->sa_family = AF_INET;
( (struct sockaddr_in *)addr )->sin_addr.s_addr = htonl( ipaddr );
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)hp );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)hp );
return 0;
} //end of the function WINS_StringToAddr
//===========================================================================
@ -694,7 +694,7 @@ int WINS_GetAddrFromName( char *name, struct sockaddr_s *addr ){
}
addr->sa_family = AF_INET;
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)net_hostport );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)net_hostport );
( (struct sockaddr_in *)addr )->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0];
return 0;
@ -736,6 +736,6 @@ int WINS_GetSocketPort( struct sockaddr_s *addr ){
// Changes Globals: -
//===========================================================================
int WINS_SetSocketPort( struct sockaddr_s *addr, int port ){
( (struct sockaddr_in *)addr )->sin_port = htons( (u_short)port );
( (struct sockaddr_in *)addr )->sin_port = htons( (unsigned short)port );
return 0;
} //end of the function WINS_SetSocketPort

2
tools/mbspc/mbspc/bspc.c
View File

@ -407,7 +407,7 @@ void CreateAASFilesForAllBSPFiles(char *quakepath)
stat(foldername, &statbuf);
#endif
//if it is a folder
if (statbuf.st_mode & S_IFDIR)
if ( S_ISDIR( statbuf.st_mode ) != 0 )
{
//
AppendPathSeperator(foldername, sizeof(foldername));

2
tools/mbspc/mbspc/l_qfiles.c
View File

@ -441,7 +441,7 @@ quakefile_t *FindQuakeFilesWithPakFilter(char *pakfilter, char *filter)
stat(pakfile, &statbuf);
#endif
//if the file with .pak or .pk3 is a folder
if (statbuf.st_mode & S_IFDIR)
if ( S_ISDIR( statbuf.st_mode ) != 0 )
{
strcpy(filename, pakfilter);
AppendPathSeperator(filename, _MAX_PATH);

1
tools/quake2/common/path_init.c
View File

@ -36,6 +36,7 @@
#include <unistd.h>
#include <pwd.h>
#include <limits.h>
#include <sys/types.h>
#endif

2
tools/quake2/qdata/qdata.c
View File

@ -275,7 +275,7 @@ void PackDirectory_r( char *dir ){
if ( stat( dirstring, &st ) == -1 ) {
Error( "fstating %s", pf->name );
}
if ( st.st_mode & S_IFDIR ) { // directory
if ( S_ISDIR( st.st_mode ) != 0 ) { // directory
PackDirectory_r( fullname );
continue;
}

1
tools/quake2/qdata_heretic2/common/path_init.c
View File

@ -37,6 +37,7 @@
#include <unistd.h>
#include <pwd.h>
#include <limits.h>
#include <sys/types.h>
#endif

2
tools/quake2/qdata_heretic2/qdata.c
View File

@ -265,7 +265,7 @@ void PackDirectory_r( char *dir ){
if ( stat( dirstring, &st ) == -1 ) {
Error( "fstating %s", pf->name );
}
if ( st.st_mode & S_IFDIR ) { // directory
if ( S_ISDIR( st.st_mode ) != 0 ) { // directory
PackDirectory_r( fullname );
continue;
}

1
tools/quake3/common/vfs.h
View File

@ -36,6 +36,7 @@
#if defined ( __linux__ ) || defined ( __APPLE__ )
#include <dirent.h>
#include <unistd.h>
#include <linux/limits.h>
#else
#include <wtypes.h>
#include <io.h>

2
tools/quake3/q3data/q3data.c
View File

@ -350,7 +350,7 @@ void PackDirectory_r( char *dir ){
if ( stat( dirstring, &st ) == -1 ) {
Error( "fstating %s", pf->name );
}
if ( st.st_mode & S_IFDIR ) { // directory
if ( S_ISDIR( st.st_mode ) != 0 ) { // directory
PackDirectory_r( fullname );
continue;
}