@@ -72,14 +72,13 @@ token_t Parser::parseToken(std::istream & fs, char * string)
72
72
{
73
73
74
74
int c;
75
- int i;
76
75
77
76
if (string != NULL )
78
77
memset (string, 0 , maxTokenSize);
79
78
80
79
81
80
/* 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 )
83
82
{
84
83
// c = fgetc(fs);
85
84
if (!fs || fs.eof ())
@@ -95,7 +94,7 @@ token_t Parser::parseToken(std::istream & fs, char * string)
95
94
std::cout << " ERROR String line buffer full. Buffer: " << string_line_buffer << std::endl;
96
95
}
97
96
return tStringBufferFilled;
98
- }
97
+ }
99
98
100
99
/* Otherwise add this character to the string line buffer */
101
100
string_line_buffer[string_line_buffer_index++] = tolower (c);
@@ -2020,7 +2019,7 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p
2020
2019
int Parser::parse_wavecode_prefix (char * token, int * id, char ** var_string)
2021
2020
{
2022
2021
2023
- int len, i, j ;
2022
+ int len, i;
2024
2023
2025
2024
if (token == NULL )
2026
2025
return PROJECTM_FAILURE;
@@ -2037,10 +2036,10 @@ int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string)
2037
2036
if (len <= WAVECODE_STRING_LENGTH)
2038
2037
return PROJECTM_FAILURE;
2039
2038
i = WAVECODE_STRING_LENGTH;
2040
- j = 0 ;
2041
2039
(*id) = 0 ;
2042
2040
2043
2041
/* This loop grabs the integer id for this custom wave */
2042
+ size_t j = 0 ;
2044
2043
while ((i < len) && (token[i] >= 48 ) && (token[i] <= 57 ))
2045
2044
{
2046
2045
if (j >= maxTokenSize)
@@ -2065,7 +2064,7 @@ int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string)
2065
2064
int Parser::parse_shapecode_prefix (char * token, int * id, char ** var_string)
2066
2065
{
2067
2066
2068
- int len, i, j ;
2067
+ int len, i;
2069
2068
2070
2069
if (token == NULL )
2071
2070
return PROJECTM_FAILURE;
@@ -2082,10 +2081,10 @@ int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string)
2082
2081
if (len <= SHAPECODE_STRING_LENGTH)
2083
2082
return PROJECTM_FAILURE;
2084
2083
i = SHAPECODE_STRING_LENGTH;
2085
- j = 0 ;
2086
2084
(*id) = 0 ;
2087
2085
2088
2086
/* This loop grabs the integer id for this custom shape */
2087
+ size_t j = 0 ;
2089
2088
while ((i < len) && (token[i] >= 48 ) && (token[i] <= 57 ))
2090
2089
{
2091
2090
if (j >= maxTokenSize)
@@ -2109,7 +2108,7 @@ int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string)
2109
2108
int Parser::parse_wave_prefix (char * token, int * id, char ** eqn_string)
2110
2109
{
2111
2110
2112
- int len, i, j ;
2111
+ int len, i;
2113
2112
2114
2113
if (token == NULL )
2115
2114
return PROJECTM_FAILURE;
@@ -2125,10 +2124,10 @@ int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string)
2125
2124
2126
2125
2127
2126
i = WAVE_STRING_LENGTH;
2128
- j = 0 ;
2129
2127
(*id) = 0 ;
2130
2128
2131
2129
/* This loop grabs the integer id for this custom wave */
2130
+ size_t j = 0 ;
2132
2131
while ((i < len) && (token[i] >= 48 ) && (token[i] <= 57 ))
2133
2132
{
2134
2133
if (j >= maxTokenSize)
@@ -2152,7 +2151,7 @@ int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string)
2152
2151
int Parser::parse_shape_prefix (char * token, int * id, char ** eqn_string)
2153
2152
{
2154
2153
2155
- int len, i, j ;
2154
+ int len, i;
2156
2155
2157
2156
if (token == NULL )
2158
2157
return PROJECTM_FAILURE;
@@ -2168,10 +2167,10 @@ int Parser::parse_shape_prefix(char * token, int * id, char ** eqn_string)
2168
2167
2169
2168
2170
2169
i = SHAPE_STRING_LENGTH;
2171
- j = 0 ;
2172
2170
(*id) = 0 ;
2173
2171
2174
2172
/* This loop grabs the integer id for this custom wave */
2173
+ size_t j = 0 ;
2175
2174
while ((i < len) && (token[i] >= 48 ) && (token[i] <= 57 ))
2176
2175
{
2177
2176
if (j >= maxTokenSize)
0 commit comments