quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation warnings (mostly size_t->int, signed/unsigned conversions).

Browse Source
This commit is contained in:
Artem Kharytoniuk
2014-07-08 23:32:09 +03:00
parent 0f690ecf79
commit 3cc9bcd542
70 changed files with 316 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/win32/vs/props/shared.props
View File

@@ -10,6 +10,9 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile />
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

10
code/win32/win_main.c
View File

@@ -75,7 +75,7 @@ void Spk_Printf (const char *text, ...)
va_start (argptr,text);
vsprintf (buf, text, argptr);
write(fh, buf, strlen(buf));
write(fh, buf, (int)strlen(buf));
_commit(fh);
va_end (argptr);
@@ -266,8 +266,8 @@ void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, ch
static qboolean strgtr(const char *s0, const char *s1) {
int l0, l1, i;
l0 = strlen(s0);
l1 = strlen(s1);
l0 = (int)strlen(s0);
l1 = (int)strlen(s1);
if (l1<l0) {
l0 = l1;
@@ -971,7 +971,7 @@ sysEvent_t Sys_GetEvent( void ) {
char *b;
int len;
len = strlen( s ) + 1;
len = (int)strlen( s ) + 1;
b = Z_Malloc( len );
Q_strncpyz( b, s, len-1 );
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, len, b );
@@ -1090,7 +1090,7 @@ void Sys_Init( void ) {
// save out a couple things in rom cvars for the renderer to access
Cvar_Get( "win_hinstance", va("%p", (void*)g_wv.hInstance), CVAR_ROM );
Cvar_Get( "win_wndproc", va("%p", (void*)MainWndProc), CVAR_ROM );
Cvar_Get( "win_wndproc", va("%p", MainWndProc), CVAR_ROM );
//
// figure out our CPU

8
code/win32/win_net.c
View File

@@ -175,7 +175,7 @@ qboolean Sys_StringToSockaddr( const char *s, struct sockaddr *sadr ) {
memset( sadr, 0, sizeof( *sadr ) );
// check for an IPX address
if( ( strlen( s ) == 21 ) && ( s[8] == '.' ) ) {
if( ( (int)strlen( s ) == 21 ) && ( s[8] == '.' ) ) {
((struct sockaddr_ipx *)sadr)->sa_family = AF_IPX;
((struct sockaddr_ipx *)sadr)->sa_socket = 0;
copy[2] = 0;
@@ -468,7 +468,7 @@ NET_IPSocket
int NET_IPSocket( char *net_interface, int port ) {
SOCKET newsocket;
struct sockaddr_in address;
qboolean _true = qtrue;
u_long _true = qtrue;
int i = 1;
int err;
@@ -623,8 +623,8 @@ void NET_OpenSocks( int port ) {
int plen;
// build the request
ulen = strlen( net_socksUsername->string );
plen = strlen( net_socksPassword->string );
ulen = (int)strlen( net_socksUsername->string );
plen = (int)strlen( net_socksPassword->string );
buf[0] = 1; // username/password authentication version
buf[1] = ulen;

10
code/win32/win_syscon.c
View File

@@ -114,7 +114,7 @@ static LONG WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
if ( ( com_dedicated && com_dedicated->integer ) )
{
cmdString = CopyString( "quit" );
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString );
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, (int)strlen( cmdString ) + 1, cmdString );
}
else if ( s_wcd.quitOnClose )
{
@@ -177,7 +177,7 @@ static LONG WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
else
{
cmdString = CopyString( "quit" );
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString );
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, (int)strlen( cmdString ) + 1, cmdString );
}
}
else if ( wParam == CLEAR_ID )
@@ -276,7 +276,7 @@ LONG WINAPI InputLineWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
if ( wParam == 13 )
{
GetWindowText( s_wcd.hwndInputLine, inputBuffer, sizeof( inputBuffer ) );
strncat( s_wcd.consoleText, inputBuffer, sizeof( s_wcd.consoleText ) - strlen( s_wcd.consoleText ) - 5 );
strncat( s_wcd.consoleText, inputBuffer, sizeof( s_wcd.consoleText ) - (int)strlen( s_wcd.consoleText ) - 5 );
strcat( s_wcd.consoleText, "\n" );
SetWindowText( s_wcd.hwndInputLine, "" );
@@ -507,9 +507,9 @@ void Conbuf_AppendText( const char *pMsg )
//
// if the message is REALLY long, use just the last portion of it
//
if ( strlen( pMsg ) > CONSOLE_BUFFER_SIZE - 1 )
if ( (int)strlen( pMsg ) > CONSOLE_BUFFER_SIZE - 1 )
{
msg = pMsg + strlen( pMsg ) - CONSOLE_BUFFER_SIZE + 1;
msg = pMsg + (int)strlen( pMsg ) - CONSOLE_BUFFER_SIZE + 1;
}
else
{