MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-25 22:55:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[misc] Improve logging of int conversion errors

Browse Source
This commit is contained in:
ejurgensen 2024-12-13 11:25:43 +01:00 committed by GitHub
parent 2f8b007d32
commit 83f95e0381
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/misc.c
View File

@ -595,19 +595,19 @@ safe_atoi32(const char *str, int32_t *val)
if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN))) if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN)))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid i32 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No i32 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > INT32_MAX) if (intval > INT32_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "i32 value out of range (%s)\n", str);
return -1; return -1;
} }
@ -634,19 +634,19 @@ safe_atou32(const char *str, uint32_t *val)
if (((errno == ERANGE) && (intval == ULONG_MAX)) if (((errno == ERANGE) && (intval == ULONG_MAX))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid u32 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No u32 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > UINT32_MAX) if (intval > UINT32_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "u32 value out of range (%s)\n", str);
return -1; return -1;
} }
@ -673,19 +673,19 @@ safe_hextou32(const char *str, uint32_t *val)
if (((errno == ERANGE) && (intval == ULONG_MAX)) if (((errno == ERANGE) && (intval == ULONG_MAX))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid u32 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No u32 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > UINT32_MAX) if (intval > UINT32_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "u32 value out of range (%s)\n", str);
return -1; return -1;
} }
@ -712,19 +712,19 @@ safe_atoi64(const char *str, int64_t *val)
if (((errno == ERANGE) && ((intval == LLONG_MAX) || (intval == LLONG_MIN))) if (((errno == ERANGE) && ((intval == LLONG_MAX) || (intval == LLONG_MIN)))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid i64 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No i64 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > INT64_MAX) if (intval > INT64_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "i64 value out of range (%s)\n", str);
return -1; return -1;
} }
@ -751,21 +751,21 @@ safe_atou64(const char *str, uint64_t *val)
if (((errno == ERANGE) && (intval == ULLONG_MAX)) if (((errno == ERANGE) && (intval == ULLONG_MAX))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid u64 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No u64 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > UINT64_MAX) if (intval > UINT64_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "u64 value out of range (%s)\n", str);
return -1; return -1;
} }
@ -792,19 +792,19 @@ safe_hextou64(const char *str, uint64_t *val)
if (((errno == ERANGE) && (intval == ULLONG_MAX)) if (((errno == ERANGE) && (intval == ULLONG_MAX))
|| ((errno != 0) && (intval == 0))) || ((errno != 0) && (intval == 0)))
{ {
DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno)); DPRINTF(E_DBG, L_MISC, "Invalid u64 in string (%s): %s\n", str, strerror(errno));
return -1; return -1;
} }
if (end == str) if (end == str)
{ {
DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str); DPRINTF(E_DBG, L_MISC, "No u64 found in string (%s)\n", str);
return -1; return -1;
} }
if (intval > UINT64_MAX) if (intval > UINT64_MAX)
{ {
DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str); DPRINTF(E_DBG, L_MISC, "u64 value out of range (%s)\n", str);
return -1; return -1;
} }