picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1739 from ssahani/word-machine 

machine: : port to extract_first_word
This commit is contained in:
Daniel Mack 2015-11-02 11:21:18 +01:00
parent 86b4428a58 75a8fd6ac8
commit 6b61ae72fa
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/machine/machine.c
View File

@ -42,6 +42,7 @@
#include "terminal-util.h"
#include "unit-name.h"
#include "util.h"
#include "extract-word.h"
Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
Machine *m;
@ -312,17 +313,23 @@ int machine_load(Machine *m) {
}
if (netif) {
size_t l, allocated = 0, nr = 0;
const char *word, *state;
size_t allocated = 0, nr = 0;
const char *p;
int *ni = NULL;
FOREACH_WORD(word, l, netif, state) {
char buf[l+1];
p = netif;
for(;;) {
_cleanup_free_ char *word = NULL;
int ifi;
*(char*) (mempcpy(buf, word, l)) = 0;
r = extract_first_word(&p, &word, NULL, 0);
if (r < 0)
return log_error_errno(r, "Failed to parse NETIF: %s", netif);
if (safe_atoi(buf, &ifi) < 0)
if (r == 0)
break;
if (safe_atoi(word, &ifi) < 0)
continue;
if (ifi <= 0)
continue;