Replace more trivial usage of sscanf
This commit is contained in:
parent
08cccc811c
commit
c89f6cf0a9
|
@ -577,12 +577,11 @@ static void frontend_android_get_version_sdk(int32_t *sdk)
|
||||||
{
|
{
|
||||||
char os_version_str[PROP_VALUE_MAX] = {0};
|
char os_version_str[PROP_VALUE_MAX] = {0};
|
||||||
system_property_get("getprop", "ro.build.version.sdk", os_version_str);
|
system_property_get("getprop", "ro.build.version.sdk", os_version_str);
|
||||||
|
|
||||||
*sdk = 0;
|
*sdk = 0;
|
||||||
if (os_version_str[0])
|
if (os_version_str[0])
|
||||||
{
|
{
|
||||||
int num_read = sscanf(os_version_str, "%d", sdk);
|
char *ptr = NULL;
|
||||||
(void) num_read;
|
sdk = (int32_t)strtol(os_version_str, &ptr, 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -458,12 +458,12 @@ static cdfs_track_t* cdfs_open_cue_track(
|
||||||
}
|
}
|
||||||
else if (!strncasecmp(line, "TRACK", 5))
|
else if (!strncasecmp(line, "TRACK", 5))
|
||||||
{
|
{
|
||||||
|
char *ptr = NULL;
|
||||||
unsigned track_number = 0;
|
unsigned track_number = 0;
|
||||||
|
const char *track = line + 5;
|
||||||
const char *track = line + 5;
|
|
||||||
cdfs_skip_spaces(&track);
|
cdfs_skip_spaces(&track);
|
||||||
|
|
||||||
sscanf(track, "%d", (int*)&track_number);
|
track_number = (unsigned)strtol(track, &ptr, 10);
|
||||||
while (*track && *track != ' ' && *track != '\n')
|
while (*track && *track != ' ' && *track != '\n')
|
||||||
++track;
|
++track;
|
||||||
|
|
||||||
|
@ -479,11 +479,8 @@ static cdfs_track_t* cdfs_open_cue_track(
|
||||||
|
|
||||||
sector_size = atoi(track + 6);
|
sector_size = atoi(track + 6);
|
||||||
}
|
}
|
||||||
else
|
else /* assume AUDIO */
|
||||||
{
|
|
||||||
/* assume AUDIO */
|
|
||||||
sector_size = 2352;
|
sector_size = 2352;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (!strncasecmp(line, "INDEX", 5))
|
else if (!strncasecmp(line, "INDEX", 5))
|
||||||
{
|
{
|
||||||
|
@ -635,10 +632,6 @@ cdfs_track_t* cdfs_open_raw_track(const char* path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
/* unsupported file type */
|
|
||||||
}
|
|
||||||
|
|
||||||
return track;
|
return track;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue