MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-21 18:26:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Integer types cleanup

Browse Source 
Try to be a bit more strict about integer types, use off_t or int64_t for
file size and file offsets.

Replace safe_ato*() by safe_atoi32() and safe_atoi64(), fix integer types
at call sites to match.
This commit is contained in:
Julien BLACHE
2010-02-02 21:02:24 +01:00
parent 5d41d2d99c
commit 58faeaceca
10 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/misc.c
View File

@@ -38,7 +38,7 @@
int
safe_atoi(const char *str, int *val)
safe_atoi32(const char *str, int32_t *val)
{
char *end;
long intval;
@@ -61,28 +61,28 @@ safe_atoi(const char *str, int *val)
return -1;
}
if (intval > INT_MAX)
if (intval > INT32_MAX)
{
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str);
return -1;
}
*val = (int)intval;
*val = (int32_t)intval;
return 0;
}
int
safe_atol(const char *str, long *val)
safe_atoi64(const char *str, int64_t *val)
{
char *end;
long intval;
long long intval;
errno = 0;
intval = strtol(str, &end, 10);
intval = strtoll(str, &end, 10);
if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN)))
if (((errno == ERANGE) && ((intval == LLONG_MAX) || (intval == LLONG_MIN)))
|| ((errno != 0) && (intval == 0)))
{
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno));
@@ -97,35 +97,14 @@ safe_atol(const char *str, long *val)
return -1;
}
*val = intval;
return 0;
}
int
safe_atoull(const char *str, unsigned long long *val)
{
char *end;
unsigned long long intval;
errno = 0;
intval = strtoull(str, &end, 10);
if (errno)
if (intval > INT64_MAX)
{
DPRINTF(E_DBG, L_MISC, "Invalid unsigned long long integer in string (%s): %s\n", str, strerror(errno));
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str);
return -1;
}
if (end == str)
{
DPRINTF(E_DBG, L_MISC, "No unsigned long long integer found in string (%s)\n", str);
return -1;
}
*val = intval;
*val = (int64_t)intval;
return 0;
}