[iortcw] 198/497: All: Port COM_ParseExt fixes to CommaParse
Simon McVittie
smcv at debian.org
Fri Sep 8 10:36:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 0ea335e89899ef1fdda5d03d6b497e914de763e2
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Fri Aug 29 17:53:55 2014 +0000
All: Port COM_ParseExt fixes to CommaParse
---
MP/code/rend2/tr_image.c | 19 ++++++++++---------
MP/code/renderer/tr_image.c | 19 ++++++++++---------
SP/code/rend2/tr_image.c | 19 ++++++++++---------
SP/code/renderer/tr_image.c | 19 ++++++++++---------
4 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index 01b09dd..957f2e8 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -3239,12 +3239,17 @@ static char *CommaParse( char **data_p ) {
c = *data;
// skip double slash comments
- if ( c == '/' && data[1] == '/' ) {
- while ( *data && *data != '\n' )
+ if ( c == '/' && data[1] == '/' )
+ {
+ data += 2;
+ while (*data && *data != '\n') {
data++;
+ }
}
// skip /* */ comments
- else if ( c == '/' && data[1] == '*' ) {
+ else if ( c == '/' && data[1] == '*' )
+ {
+ data += 2;
while ( *data && ( *data != '*' || data[1] != '/' ) )
{
data++;
@@ -3273,7 +3278,7 @@ static char *CommaParse( char **data_p ) {
*data_p = ( char * ) data;
return com_token;
}
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -3283,7 +3288,7 @@ static char *CommaParse( char **data_p ) {
// parse a regular word
do
{
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -3291,10 +3296,6 @@ static char *CommaParse( char **data_p ) {
c = *data;
} while ( c > 32 && c != ',' );
- if ( len == MAX_TOKEN_CHARS ) {
-// ri.Printf (PRINT_DEVELOPER, "Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
- len = 0;
- }
com_token[len] = 0;
*data_p = ( char * ) data;
diff --git a/MP/code/renderer/tr_image.c b/MP/code/renderer/tr_image.c
index 8d33f49..8af7bdb 100644
--- a/MP/code/renderer/tr_image.c
+++ b/MP/code/renderer/tr_image.c
@@ -1633,12 +1633,17 @@ static char *CommaParse( char **data_p ) {
c = *data;
// skip double slash comments
- if ( c == '/' && data[1] == '/' ) {
- while ( *data && *data != '\n' )
+ if ( c == '/' && data[1] == '/' )
+ {
+ data += 2;
+ while (*data && *data != '\n') {
data++;
+ }
}
// skip /* */ comments
- else if ( c == '/' && data[1] == '*' ) {
+ else if ( c == '/' && data[1] == '*' )
+ {
+ data += 2;
while ( *data && ( *data != '*' || data[1] != '/' ) )
{
data++;
@@ -1667,7 +1672,7 @@ static char *CommaParse( char **data_p ) {
*data_p = ( char * ) data;
return com_token;
}
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -1677,7 +1682,7 @@ static char *CommaParse( char **data_p ) {
// parse a regular word
do
{
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -1685,10 +1690,6 @@ static char *CommaParse( char **data_p ) {
c = *data;
} while ( c > 32 && c != ',' );
- if ( len == MAX_TOKEN_CHARS ) {
-// ri.Printf (PRINT_DEVELOPER, "Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
- len = 0;
- }
com_token[len] = 0;
*data_p = ( char * ) data;
diff --git a/SP/code/rend2/tr_image.c b/SP/code/rend2/tr_image.c
index 0781cc1..92320be 100644
--- a/SP/code/rend2/tr_image.c
+++ b/SP/code/rend2/tr_image.c
@@ -3251,12 +3251,17 @@ static char *CommaParse( char **data_p ) {
c = *data;
// skip double slash comments
- if ( c == '/' && data[1] == '/' ) {
- while ( *data && *data != '\n' )
+ if ( c == '/' && data[1] == '/' )
+ {
+ data += 2;
+ while ( *data && *data != '\n' ) {
data++;
+ }
}
// skip /* */ comments
- else if ( c == '/' && data[1] == '*' ) {
+ else if ( c == '/' && data[1] == '*' )
+ {
+ data += 2;
while ( *data && ( *data != '*' || data[1] != '/' ) )
{
data++;
@@ -3285,7 +3290,7 @@ static char *CommaParse( char **data_p ) {
*data_p = ( char * ) data;
return com_token;
}
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -3295,7 +3300,7 @@ static char *CommaParse( char **data_p ) {
// parse a regular word
do
{
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -3303,10 +3308,6 @@ static char *CommaParse( char **data_p ) {
c = *data;
} while ( c > 32 && c != ',' );
- if ( len == MAX_TOKEN_CHARS ) {
-// ri.Printf (PRINT_DEVELOPER, "Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
- len = 0;
- }
com_token[len] = 0;
*data_p = ( char * ) data;
diff --git a/SP/code/renderer/tr_image.c b/SP/code/renderer/tr_image.c
index 3929e79..1a0eb18 100644
--- a/SP/code/renderer/tr_image.c
+++ b/SP/code/renderer/tr_image.c
@@ -1699,12 +1699,17 @@ static char *CommaParse( char **data_p ) {
c = *data;
// skip double slash comments
- if ( c == '/' && data[1] == '/' ) {
- while ( *data && *data != '\n' )
+ if ( c == '/' && data[1] == '/' )
+ {
+ data += 2;
+ while ( *data && *data != '\n' ) {
data++;
+ }
}
// skip /* */ comments
- else if ( c == '/' && data[1] == '*' ) {
+ else if ( c == '/' && data[1] == '*' )
+ {
+ data += 2;
while ( *data && ( *data != '*' || data[1] != '/' ) )
{
data++;
@@ -1733,7 +1738,7 @@ static char *CommaParse( char **data_p ) {
*data_p = ( char * ) data;
return com_token;
}
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -1743,7 +1748,7 @@ static char *CommaParse( char **data_p ) {
// parse a regular word
do
{
- if ( len < MAX_TOKEN_CHARS ) {
+ if ( len < MAX_TOKEN_CHARS - 1 ) {
com_token[len] = c;
len++;
}
@@ -1751,10 +1756,6 @@ static char *CommaParse( char **data_p ) {
c = *data;
} while ( c > 32 && c != ',' );
- if ( len == MAX_TOKEN_CHARS ) {
-// ri.Printf (PRINT_DEVELOPER, "Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
- len = 0;
- }
com_token[len] = 0;
*data_p = ( char * ) data;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list