1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Fix up style in _Mix_ParseTime

This does the following:

- Const-qualify variables if they are not modified
- Place each statement onto their own separate lines
- Place the asterisk with the type instead of the variable name
- Combine declarations and initializations where possible
This commit is contained in:
Misa 2022-11-13 19:03:26 -08:00
parent 2d6b2e685b
commit 6dd9200503

View file

@ -524,11 +524,11 @@ end:
} }
} }
static int _Mix_ParseTime(char *time, long samplerate_hz) static int _Mix_ParseTime(char* time, const long samplerate_hz)
{ {
char *num_start, *p; char* num_start = time;
Sint64 result; char* p;
char c; Sint64 result = 0;
int val; int val;
/* Time is directly expressed as a sample position */ /* Time is directly expressed as a sample position */
@ -537,15 +537,14 @@ end:
return SDL_strtoll(time, NULL, 10); return SDL_strtoll(time, NULL, 10);
} }
result = 0;
num_start = time;
for (p = time; *p != '\0'; ++p) for (p = time; *p != '\0'; ++p)
{ {
if (*p == '.' || *p == ':') if (*p == '.' || *p == ':')
{ {
c = *p; *p = '\0'; const char c = *p;
if ((val = SDL_atoi(num_start)) < 0) *p = '\0';
val = SDL_atoi(num_start);
if (val < 0)
{ {
return -1; return -1;
} }
@ -556,7 +555,7 @@ end:
if (*p == '.') if (*p == '.')
{ {
double val_f = SDL_atof(p); const double val_f = SDL_atof(p);
if (val_f < 0) if (val_f < 0)
{ {
return -1; return -1;
@ -565,7 +564,8 @@ end:
} }
} }
if ((val = SDL_atoi(num_start)) < 0) val = SDL_atoi(num_start);
if (val < 0)
{ {
return -1; return -1;
} }