chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup2: use new fstype for unified hierarchy
[elogind.git]
/
src
/
basic
/
parse-util.c
diff --git
a/src/basic/parse-util.c
b/src/basic/parse-util.c
index 6e24bdee4dfedfdb64fb8b1bcd5df47090bd63d2..29012b837638b059dc8bb533a9da0c732b612382 100644
(file)
--- a/
src/basic/parse-util.c
+++ b/
src/basic/parse-util.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,11
+17,19
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <errno.h>
+#include <inttypes.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+//#include <xlocale.h>
+
#include "alloc-util.h"
//#include "extract-word.h"
#include "alloc-util.h"
//#include "extract-word.h"
+#include "macro.h"
#include "parse-util.h"
#include "string-util.h"
#include "parse-util.h"
#include "string-util.h"
-#include "util.h"
int parse_boolean(const char *v) {
assert(v);
int parse_boolean(const char *v) {
assert(v);
@@
-73,7
+79,7
@@
int parse_mode(const char *s, mode_t *ret) {
errno = 0;
l = strtol(s, &x, 8);
errno = 0;
l = strtol(s, &x, 8);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-168,7
+174,7
@@
int parse_size(const char *t, uint64_t base, uint64_t *size) {
errno = 0;
l = strtoull(p, &e, 10);
errno = 0;
l = strtoull(p, &e, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (e == p)
return -EINVAL;
return -errno;
if (e == p)
return -EINVAL;
@@
-184,7
+190,7
@@
int parse_size(const char *t, uint64_t base, uint64_t *size) {
char *e2;
l2 = strtoull(e, &e2, 10);
char *e2;
l2 = strtoull(e, &e2, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
/* Ignore failure. E.g. 10.M is valid */
return -errno;
/* Ignore failure. E.g. 10.M is valid */
@@
-324,7
+330,7
@@
int safe_atou(const char *s, unsigned *ret_u) {
errno = 0;
l = strtoul(s, &x, 0);
errno = 0;
l = strtoul(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-346,7
+352,7
@@
int safe_atoi(const char *s, int *ret_i) {
errno = 0;
l = strtol(s, &x, 0);
errno = 0;
l = strtol(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-368,7
+374,7
@@
int safe_atollu(const char *s, long long unsigned *ret_llu) {
errno = 0;
l = strtoull(s, &x, 0);
errno = 0;
l = strtoull(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-388,7
+394,7
@@
int safe_atolli(const char *s, long long int *ret_lli) {
errno = 0;
l = strtoll(s, &x, 0);
errno = 0;
l = strtoll(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-408,7
+414,7
@@
int safe_atou8(const char *s, uint8_t *ret) {
errno = 0;
l = strtoul(s, &x, 0);
errno = 0;
l = strtoul(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-432,7
+438,7
@@
int safe_atou16(const char *s, uint16_t *ret) {
errno = 0;
l = strtoul(s, &x, 0);
errno = 0;
l = strtoul(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-454,7
+460,7
@@
int safe_atoi16(const char *s, int16_t *ret) {
errno = 0;
l = strtol(s, &x, 0);
errno = 0;
l = strtol(s, &x, 0);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (!x || x == s || *x)
return -EINVAL;
return -errno;
if (!x || x == s || *x)
return -EINVAL;
@@
-479,7
+485,7
@@
int safe_atod(const char *s, double *ret_d) {
errno = 0;
d = strtod_l(s, &x, loc);
errno = 0;
d = strtod_l(s, &x, loc);
- if (errno
!=
0) {
+ if (errno
>
0) {
freelocale(loc);
return -errno;
}
freelocale(loc);
return -errno;
}