chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not format USEC_INFINITY as NULL
[elogind.git]
/
src
/
shared
/
time-util.c
diff --git
a/src/shared/time-util.c
b/src/shared/time-util.c
index 2dc01e6ed30e1d3594f56e8333219216c91269a2..066ef973ac88d64e4a512d9743b03aca9534c53f 100644
(file)
--- a/
src/shared/time-util.c
+++ b/
src/shared/time-util.c
@@
-279,11
+279,8
@@
char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
assert(buf);
assert(l > 0);
assert(buf);
assert(l > 0);
- if (t == USEC_INFINITY)
- return NULL;
-
- if (t <= 0) {
- snprintf(p, l, "0");
+ if (t == USEC_INFINITY || t <= 0) {
+ strncpy(p, t == USEC_INFINITY ? "infinity" : "0", l);
p[l-1] = 0;
return p;
}
p[l-1] = 0;
return p;
}
@@
-628,7
+625,7
@@
int parse_sec(const char *t, usec_t *usec) {
{ "", USEC_PER_SEC }, /* default is sec */
};
{ "", USEC_PER_SEC }, /* default is sec */
};
- const char *p;
+ const char *p
, *s
;
usec_t r = 0;
bool something = false;
usec_t r = 0;
bool something = false;
@@
-636,6
+633,18
@@
int parse_sec(const char *t, usec_t *usec) {
assert(usec);
p = t;
assert(usec);
p = t;
+
+ p += strspn(p, WHITESPACE);
+ s = startswith(p, "infinity");
+ if (s) {
+ s += strspn(s, WHITESPACE);
+ if (*s != 0)
+ return -EINVAL;
+
+ *usec = USEC_INFINITY;
+ return 0;
+ }
+
for (;;) {
long long l, z = 0;
char *e;
for (;;) {
long long l, z = 0;
char *e;