projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
117b940
)
machine: fix extract_first_word
author
Susant Sahani
<ssahani@gmail.com>
Mon, 2 Nov 2015 11:25:59 +0000
(16:55 +0530)
committer
Susant Sahani
<ssahani@gmail.com>
Mon, 2 Nov 2015 11:25:59 +0000
(16:55 +0530)
src/machine/machine.c
patch
|
blob
|
history
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index
df8391c
..
ef5c855
100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-323,11
+323,14
@@
int machine_load(Machine *m) {
int ifi;
r = extract_first_word(&p, &word, NULL, 0);
- if (r < 0)
- return log_error_errno(r, "Failed to parse NETIF: %s", netif);
-
if (r == 0)
break;
+ else if (r == -ENOMEM)
+ return log_oom();
+ else if (r < 0) {
+ log_warning_errno(r, "Failed to parse NETIF: %s", netif);
+ continue;
+ }
if (safe_atoi(word, &ifi) < 0)
continue;