shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-18 06:03:42 +03:00
Code

util: workaround two gcc warnings

Browse Source 
gcc does not know that errno cannot be negative, and warns
about unitialized variables later on. Kill the warnings by
returning -errno only after checking that errno is positive.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-21 23:24:30 -04:00
parent 6fe391c56d
commit 48deb058b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/util.c
View File

@ -290,7 +290,7 @@ int safe_atou(const char *s, unsigned *ret_u) {
l = strtoul(s, &x, 0);
if (!x || x == s || *x || errno)
return errno ? -errno : -EINVAL;
return errno > 0 ? -errno : -EINVAL;
if ((unsigned long) (unsigned) l != l)
return -ERANGE;
@ -310,7 +310,7 @@ int safe_atoi(const char *s, int *ret_i) {
l = strtol(s, &x, 0);
if (!x || x == s || *x || errno)
return errno ? -errno : -EINVAL;
return errno > 0 ? -errno : -EINVAL;
if ((long) (int) l != l)
return -ERANGE;