Skip to content

Commit 5a165f5

Browse files
JohannesKauffmannkblaschke
authored andcommitted
Parser: use size_t variable where possible
This fixes some -Wsign-compare warnings.
1 parent 4d2345c commit 5a165f5

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/libprojectM/MilkdropPresetFactory/Parser.cpp

+10-11
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@ token_t Parser::parseToken(std::istream & fs, char * string)
7272
{
7373

7474
int c;
75-
int i;
7675

7776
if (string != NULL)
7877
memset(string, 0, maxTokenSize);
7978

8079

8180
/* Loop until a delimiter is found, or the maximum string size is found */
82-
for (i = 0; i < maxTokenSize;i++)
81+
for (size_t i = 0; i < maxTokenSize; ++i)
8382
{
8483
//c = fgetc(fs);
8584
if (!fs || fs.eof())
@@ -95,7 +94,7 @@ token_t Parser::parseToken(std::istream & fs, char * string)
9594
std::cout << "ERROR String line buffer full. Buffer: " << string_line_buffer << std::endl;
9695
}
9796
return tStringBufferFilled;
98-
}
97+
}
9998

10099
/* Otherwise add this character to the string line buffer */
101100
string_line_buffer[string_line_buffer_index++] = tolower(c);
@@ -2020,7 +2019,7 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p
20202019
int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string)
20212020
{
20222021

2023-
int len, i, j;
2022+
int len, i;
20242023

20252024
if (token == NULL)
20262025
return PROJECTM_FAILURE;
@@ -2037,10 +2036,10 @@ int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string)
20372036
if (len <= WAVECODE_STRING_LENGTH)
20382037
return PROJECTM_FAILURE;
20392038
i = WAVECODE_STRING_LENGTH;
2040-
j = 0;
20412039
(*id) = 0;
20422040

20432041
/* This loop grabs the integer id for this custom wave */
2042+
size_t j = 0;
20442043
while ((i < len) && (token[i] >= 48) && (token[i] <= 57))
20452044
{
20462045
if (j >= maxTokenSize)
@@ -2065,7 +2064,7 @@ int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string)
20652064
int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string)
20662065
{
20672066

2068-
int len, i, j;
2067+
int len, i;
20692068

20702069
if (token == NULL)
20712070
return PROJECTM_FAILURE;
@@ -2082,10 +2081,10 @@ int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string)
20822081
if (len <= SHAPECODE_STRING_LENGTH)
20832082
return PROJECTM_FAILURE;
20842083
i = SHAPECODE_STRING_LENGTH;
2085-
j = 0;
20862084
(*id) = 0;
20872085

20882086
/* This loop grabs the integer id for this custom shape */
2087+
size_t j = 0;
20892088
while ((i < len) && (token[i] >= 48) && (token[i] <= 57))
20902089
{
20912090
if (j >= maxTokenSize)
@@ -2109,7 +2108,7 @@ int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string)
21092108
int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string)
21102109
{
21112110

2112-
int len, i, j;
2111+
int len, i;
21132112

21142113
if (token == NULL)
21152114
return PROJECTM_FAILURE;
@@ -2125,10 +2124,10 @@ int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string)
21252124

21262125

21272126
i = WAVE_STRING_LENGTH;
2128-
j = 0;
21292127
(*id) = 0;
21302128

21312129
/* This loop grabs the integer id for this custom wave */
2130+
size_t j = 0;
21322131
while ((i < len) && (token[i] >= 48) && (token[i] <= 57))
21332132
{
21342133
if (j >= maxTokenSize)
@@ -2152,7 +2151,7 @@ int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string)
21522151
int Parser::parse_shape_prefix(char * token, int * id, char ** eqn_string)
21532152
{
21542153

2155-
int len, i, j;
2154+
int len, i;
21562155

21572156
if (token == NULL)
21582157
return PROJECTM_FAILURE;
@@ -2168,10 +2167,10 @@ int Parser::parse_shape_prefix(char * token, int * id, char ** eqn_string)
21682167

21692168

21702169
i = SHAPE_STRING_LENGTH;
2171-
j = 0;
21722170
(*id) = 0;
21732171

21742172
/* This loop grabs the integer id for this custom wave */
2173+
size_t j = 0;
21752174
while ((i < len) && (token[i] >= 48) && (token[i] <= 57))
21762175
{
21772176
if (j >= maxTokenSize)

0 commit comments

Comments
 (0)