diff options
author | Ben Pfaff <blp@ovn.org> | 2016-06-24 21:30:39 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2016-07-13 13:43:37 -0700 |
commit | 63a10e1e4c48c314f002112f45e4a03b0db2357c (patch) | |
tree | 12e78a12fa9e4839afaa4543634c2b177fc561c2 /ovn | |
parent | 6026f53491068ac4d446bbc70ecbea3bb22b70fa (diff) | |
download | openvswitch-63a10e1e4c48c314f002112f45e4a03b0db2357c.tar.gz |
sset: New function sset_from_delimited_string().
This simplifies code in a couple of places.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-By: Ryan Moats <rmoats@us.ibm.com>
Diffstat (limited to 'ovn')
-rw-r--r-- | ovn/utilities/ovn-sbctl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 37e4bce29..2c68f795b 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/ovn/utilities/ovn-sbctl.c @@ -548,14 +548,8 @@ cmd_chassis_add(struct ctl_context *ctx) check_conflicts(sbctl_ctx, ch_name, xasprintf("cannot create a chassis named %s", ch_name)); - char *tokstr = xstrdup(encap_types); - char *token, *save_ptr = NULL; - struct sset encap_set = SSET_INITIALIZER(&encap_set); - for (token = strtok_r(tokstr, ",", &save_ptr); token != NULL; - token = strtok_r(NULL, ",", &save_ptr)) { - sset_add(&encap_set, token); - } - free(tokstr); + struct sset encap_set; + sset_from_delimited_string(&encap_set, encap_types, ","); size_t n_encaps = sset_count(&encap_set); struct sbrec_encap **encaps = xmalloc(n_encaps * sizeof *encaps); |