thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lib/strutils: add more ERANGE messages

Browse source 
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2016-02-21 14:35:47 +01:00
parent 73b9e094a8
commit ca8eff2ade
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/strutils.c
View file

@ -257,9 +257,10 @@ int16_t strtos16_or_err(const char *str, const char *errmesg)
{
int32_t num = strtos32_or_err(str, errmesg);
if (num < INT16_MIN || num > INT16_MAX)
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
if (num < INT16_MIN || num > INT16_MAX) {
errno = ERANGE;
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
return num;
}
@ -267,9 +268,10 @@ uint16_t strtou16_or_err(const char *str, const char *errmesg)
{
uint32_t num = strtou32_or_err(str, errmesg);
if (num > UINT16_MAX)
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
if (num > UINT16_MAX) {
errno = ERANGE;
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
return num;
}
@ -277,9 +279,10 @@ int32_t strtos32_or_err(const char *str, const char *errmesg)
{
int64_t num = strtos64_or_err(str, errmesg);
if (num < INT32_MIN || num > INT32_MAX)
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
if (num < INT32_MIN || num > INT32_MAX) {
errno = ERANGE;
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
return num;
}
@ -287,9 +290,10 @@ uint32_t strtou32_or_err(const char *str, const char *errmesg)
{
uint64_t num = strtou64_or_err(str, errmesg);
if (num > UINT32_MAX)
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
if (num > UINT32_MAX) {
errno = ERANGE;
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
return num;
}