diff options
| author | Susant Sahani <ssahani@gmail.com> | 2015-10-26 09:57:38 +0530 |
|---|---|---|
| committer | Susant Sahani <ssahani@gmail.com> | 2015-11-10 22:17:58 +0530 |
| commit | af40397dea5579b5a3c2b369936281904f05a801 (patch) | |
| tree | 9b2686d85f87e97a0060ea45226d88e867119e61 | |
| parent | 022833c89765e7ce1056b13a3641ccc2a6d0fcf5 (diff) | |
networkctl: lldp port to extract_first_word
| -rw-r--r-- | src/network/networkctl.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index ba7e3ba74a..446b048ef1 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -910,12 +910,10 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL; _cleanup_netlink_unref_ sd_netlink *rtnl = NULL; _cleanup_free_ LinkInfo *links = NULL; - const char *state, *word; - double ttl = -1; uint32_t capability; int i, r, c, j; - size_t ll; + const char *p; char **s; pager_open_if_enabled(); @@ -956,14 +954,19 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { return -ENOMEM; STRV_FOREACH(s, l) { - FOREACH_WORD_QUOTED(word, ll, *s, state) { - _cleanup_free_ char *t = NULL, *a = NULL, *b = NULL; - t = strndup(word, ll); - if (!t) - return -ENOMEM; + p = *s; + for (;;) { + _cleanup_free_ char *a = NULL, *b = NULL, *word = NULL; + + r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES); + if (r < 0) + return log_error_errno(r, "Failed to parse LLDP syntax \"%s\": %m", *s); + + if (r == 0) + break; - r = split_pair(t, "=", &a, &b); + r = split_pair(word, "=", &a, &b); if (r < 0) continue; |