shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

parse-util: coding style fix

Browse Source 
Let's not rely on C's downgrade-to-bool feature to check for NUL bytes
This commit is contained in:
Lennart Poettering 2018-01-16 11:49:24 +01:00
parent e520e0fc2c
commit b5ffbc5579
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/parse-util.c
View File

@ -84,7 +84,7 @@ int parse_mode(const char *s, mode_t *ret) {
l = strtol(s, &x, 8); l = strtol(s, &x, 8);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if (l < 0 || l > 07777) if (l < 0 || l > 07777)
return -ERANGE; return -ERANGE;
@ -392,7 +392,7 @@ int safe_atou(const char *s, unsigned *ret_u) {
l = strtoul(s, &x, 0); l = strtoul(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if (s[0] == '-') if (s[0] == '-')
return -ERANGE; return -ERANGE;
@ -414,7 +414,7 @@ int safe_atoi(const char *s, int *ret_i) {
l = strtol(s, &x, 0); l = strtol(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if ((long) (int) l != l) if ((long) (int) l != l)
return -ERANGE; return -ERANGE;
@ -436,7 +436,7 @@ int safe_atollu(const char *s, long long unsigned *ret_llu) {
l = strtoull(s, &x, 0); l = strtoull(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if (*s == '-') if (*s == '-')
return -ERANGE; return -ERANGE;
@ -456,7 +456,7 @@ int safe_atolli(const char *s, long long int *ret_lli) {
l = strtoll(s, &x, 0); l = strtoll(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
*ret_lli = l; *ret_lli = l;
@ -476,7 +476,7 @@ int safe_atou8(const char *s, uint8_t *ret) {
l = strtoul(s, &x, 0); l = strtoul(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if (s[0] == '-') if (s[0] == '-')
return -ERANGE; return -ERANGE;
@ -500,7 +500,7 @@ int safe_atou16(const char *s, uint16_t *ret) {
l = strtoul(s, &x, 0); l = strtoul(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if (s[0] == '-') if (s[0] == '-')
return -ERANGE; return -ERANGE;
@ -522,7 +522,7 @@ int safe_atoi16(const char *s, int16_t *ret) {
l = strtol(s, &x, 0); l = strtol(s, &x, 0);
if (errno > 0) if (errno > 0)
return -errno; return -errno;
if (!x || x == s || *x) if (!x || x == s || *x != 0)
return -EINVAL; return -EINVAL;
if ((long) (int16_t) l != l) if ((long) (int16_t) l != l)
return -ERANGE; return -ERANGE;