ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-14 06:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug 5146 - Remove last of warnings under gcc 4.6.1 for Linux, patch by q3urt.undead@gmail.com

Browse source
This commit is contained in:
Thilo Schulz 2011-08-05 13:33:15 +00:00
parent c1b3b6f0be
commit 52aed503b5
7 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/qcommon/q_shared.c
View file

@ -706,12 +706,11 @@ int Q_isalpha( int c )
qboolean Q_isanumber( const char *s ) qboolean Q_isanumber( const char *s )
{ {
char *p; char *p;
double d;
if( *s == '\0' ) if( *s == '\0' )
return qfalse; return qfalse;
d = strtod( s, &p ); strtod( s, &p );
return *p == '\0'; return *p == '\0';
} }

19
code/sys/con_tty.c
View file

@ -88,14 +88,13 @@ send "\b \b"
static void CON_Back( void ) static void CON_Back( void )
{ {
char key; char key;
size_t size;
key = '\b'; key = '\b';
size = write(STDOUT_FILENO, &key, 1); write(STDOUT_FILENO, &key, 1);
key = ' '; key = ' ';
size = write(STDOUT_FILENO, &key, 1); write(STDOUT_FILENO, &key, 1);
key = '\b'; key = '\b';
size = write(STDOUT_FILENO, &key, 1); write(STDOUT_FILENO, &key, 1);
} }
/* /*
@ -146,13 +145,12 @@ static void CON_Show( void )
ttycon_hide--; ttycon_hide--;
if (ttycon_hide == 0) if (ttycon_hide == 0)
{ {
size_t size; write(STDOUT_FILENO, "]", 1);
size = write(STDOUT_FILENO, "]", 1);
if (TTY_con.cursor) if (TTY_con.cursor)
{ {
for (i=0; i<TTY_con.cursor; i++) for (i=0; i<TTY_con.cursor; i++)
{ {
size = write(STDOUT_FILENO, TTY_con.buffer+i, 1); write(STDOUT_FILENO, TTY_con.buffer+i, 1);
} }
} }
} }
@ -329,7 +327,6 @@ char *CON_Input( void )
int avail; int avail;
char key; char key;
field_t *history; field_t *history;
size_t size;
if(ttycon_on) if(ttycon_on)
{ {
@ -359,8 +356,8 @@ char *CON_Input( void )
Q_strncpyz(text, TTY_con.buffer, sizeof(text)); Q_strncpyz(text, TTY_con.buffer, sizeof(text));
Field_Clear(&TTY_con); Field_Clear(&TTY_con);
key = '\n'; key = '\n';
size = write(1, &key, 1); write(1, &key, 1);
size = write( 1, "]", 1 ); write( 1, "]", 1 );
return text; return text;
} }
if (key == '\t') if (key == '\t')
@ -424,7 +421,7 @@ char *CON_Input( void )
TTY_con.buffer[TTY_con.cursor] = key; TTY_con.buffer[TTY_con.cursor] = key;
TTY_con.cursor++; TTY_con.cursor++;
// print the current line (this is differential) // print the current line (this is differential)
size = write(STDOUT_FILENO, &key, 1); write(STDOUT_FILENO, &key, 1);
} }
return NULL; return NULL;

5
code/tools/asm/q3asm.c
View file

@ -950,12 +950,11 @@ STAT("PROC");
ASM(ENDPROC) ASM(ENDPROC)
{ {
int v, v2;
if ( !strcmp( token, "endproc" ) ) { if ( !strcmp( token, "endproc" ) ) {
STAT("ENDPROC"); STAT("ENDPROC");
Parse(); // skip the function name Parse(); // skip the function name
v = ParseValue(); // locals ParseValue(); // locals
v2 = ParseValue(); // arg marshalling ParseValue(); // arg marshalling
// all functions must leave something on the opstack // all functions must leave something on the opstack
instructionCount++; instructionCount++;

8
code/tools/lcc/cpp/include.c
View file

@ -40,7 +40,7 @@ doinclude(Tokenrow *trp)
{ {
char fname[256], iname[256]; char fname[256], iname[256];
Includelist *ip; Includelist *ip;
int angled, len, wlen, fd, i; int angled, len, fd, i;
trp->tp += 1; trp->tp += 1;
if (trp->tp>=trp->lp) if (trp->tp>=trp->lp)
@ -92,9 +92,9 @@ doinclude(Tokenrow *trp)
break; break;
} }
if ( Mflag>1 || (!angled&&Mflag==1) ) { if ( Mflag>1 || (!angled&&Mflag==1) ) {
wlen = write(1,objname,strlen(objname)); write(1,objname,strlen(objname));
wlen = write(1,iname,strlen(iname)); write(1,iname,strlen(iname));
wlen = write(1,"\n",1); write(1,"\n",1);
} }
if (fd >= 0) { if (fd >= 0) {
if (++incdepth > 10) if (++incdepth > 10)

11
code/tools/lcc/cpp/tokens.c
View file

@ -290,7 +290,7 @@ void
puttokens(Tokenrow *trp) puttokens(Tokenrow *trp)
{ {
Token *tp; Token *tp;
int len, wlen; int len;
uchar *p; uchar *p;
if (verbose) if (verbose)
@ -305,15 +305,15 @@ puttokens(Tokenrow *trp)
} }
if (len>OBS/2) { /* handle giant token */ if (len>OBS/2) { /* handle giant token */
if (wbp > wbuf) if (wbp > wbuf)
wlen = write(1, wbuf, wbp-wbuf); write(1, wbuf, wbp-wbuf);
wlen = write(1, (char *)p, len); write(1, (char *)p, len);
wbp = wbuf; wbp = wbuf;
} else { } else {
memcpy(wbp, p, len); memcpy(wbp, p, len);
wbp += len; wbp += len;
} }
if (wbp >= &wbuf[OBS]) { if (wbp >= &wbuf[OBS]) {
wlen = write(1, wbuf, OBS); write(1, wbuf, OBS);
if (wbp > &wbuf[OBS]) if (wbp > &wbuf[OBS])
memcpy(wbuf, wbuf+OBS, wbp - &wbuf[OBS]); memcpy(wbuf, wbuf+OBS, wbp - &wbuf[OBS]);
wbp -= OBS; wbp -= OBS;
@ -327,9 +327,8 @@ puttokens(Tokenrow *trp)
void void
flushout(void) flushout(void)
{ {
int wlen;
if (wbp>wbuf) { if (wbp>wbuf) {
wlen = write(1, wbuf, wbp-wbuf); write(1, wbuf, wbp-wbuf);
wbp = wbuf; wbp = wbuf;
} }
} }

3
code/tools/lcc/etc/lcc.c
View file

@ -813,10 +813,9 @@ char *strsave(const char *str) {
char *stringf(const char *fmt, ...) { char *stringf(const char *fmt, ...) {
char buf[1024]; char buf[1024];
va_list ap; va_list ap;
int n;
va_start(ap, fmt); va_start(ap, fmt);
n = vsprintf(buf, fmt, ap); vsprintf(buf, fmt, ap);
va_end(ap); va_end(ap);
return strsave(buf); return strsave(buf);
} }

3
code/tools/lcc/src/bytecode.c
View file

@ -261,8 +261,7 @@ static void LoadSourceFile( const char *filename ) {
length = filelength( f ); length = filelength( f );
sourceFile = malloc( length + 1 ); sourceFile = malloc( length + 1 );
if ( sourceFile ) { if ( sourceFile ) {
size_t size; fread( sourceFile, length, 1, f );
size = fread( sourceFile, length, 1, f );
sourceFile[length] = 0; sourceFile[length] = 0;
} }