summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-03-25 15:11:05 -0700
committerBen Pfaff <blp@nicira.com>2011-03-31 16:42:01 -0700
commit33d532dafaf36cafa1f65c8d4ed042e9ddef8078 (patch)
tree17bdf91c5167f08a13801133a99ea611de78477b /lib
parent81e2083fe6b7c16055f01c4b1e40f25867594bf6 (diff)
downloadopenvswitch-33d532dafaf36cafa1f65c8d4ed042e9ddef8078.tar.gz
ovs-openflowd: Use sset in place of svec.
Also deletes svec_split() since this was the only user.
Diffstat (limited to 'lib')
-rw-r--r--lib/svec.c18
-rw-r--r--lib/svec.h3
2 files changed, 2 insertions, 19 deletions
diff --git a/lib/svec.c b/lib/svec.c
index d576c21d1..03c374727 100644
--- a/lib/svec.c
+++ b/lib/svec.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -372,22 +372,6 @@ svec_join(const struct svec *svec,
return ds_cstr(&ds);
}
-/* Breaks 's' into tokens at any character in 'delimiters', and appends each
- * token to 'svec'. Empty tokens are not added. */
-void
-svec_split(struct svec *svec, const char *s_, const char *delimiters)
-{
- char *s = xstrdup(s_);
- char *save_ptr = NULL;
- char *token;
-
- for (token = strtok_r(s, delimiters, &save_ptr); token != NULL;
- token = strtok_r(NULL, delimiters, &save_ptr)) {
- svec_add(svec, token);
- }
- free(s);
-}
-
const char *
svec_back(const struct svec *svec)
{
diff --git a/lib/svec.h b/lib/svec.h
index 7fdc6b513..0ee058c1e 100644
--- a/lib/svec.h
+++ b/lib/svec.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@ void svec_swap(struct svec *a, struct svec *b);
void svec_print(const struct svec *svec, const char *title);
void svec_parse_words(struct svec *svec, const char *words);
bool svec_equal(const struct svec *, const struct svec *);
-void svec_split(struct svec *, const char *s, const char *delimiters);
char *svec_join(const struct svec *,
const char *delimiter, const char *terminator);
const char *svec_back(const struct svec *);