X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsvec.c;h=d083ebb864c4f3e164fe947547327f57372835af;hb=HEAD;hp=d576c21d1e29addd55c4d565fc35eb982b112150;hpb=d98e60075528c3065ad453f7add4b30f22edcde3;p=sliver-openvswitch.git

diff --git a/lib/svec.c b/lib/svec.c
index d576c21d1..d083ebb86 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, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 #include <config.h>
 #include "svec.h"
-#include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -141,7 +140,7 @@ svec_sort_unique(struct svec *svec)
 void
 svec_unique(struct svec *svec)
 {
-    assert(svec_is_sorted(svec));
+    ovs_assert(svec_is_sorted(svec));
     if (svec->n > 1) {
         /* This algorithm is lazy and sub-optimal, but it's "obviously correct"
          * and asymptotically optimal . */
@@ -179,8 +178,8 @@ svec_diff(const struct svec *a, const struct svec *b,
 {
     size_t i, j;
 
-    assert(svec_is_sorted(a));
-    assert(svec_is_sorted(b));
+    ovs_assert(svec_is_sorted(a));
+    ovs_assert(svec_is_sorted(b));
     if (a_only) {
         svec_init(a_only);
     }
@@ -233,7 +232,7 @@ svec_find(const struct svec *svec, const char *name)
 {
     char **p;
 
-    assert(svec_is_sorted(svec));
+    ovs_assert(svec_is_sorted(svec));
     p = bsearch(&name, svec->names, svec->n, sizeof *svec->names,
                 compare_strings);
     return p ? p - svec->names : SIZE_MAX;
@@ -261,7 +260,7 @@ svec_is_unique(const struct svec *svec)
 const char *
 svec_get_duplicate(const struct svec *svec)
 {
-    assert(svec_is_sorted(svec));
+    ovs_assert(svec_is_sorted(svec));
     if (svec->n > 1) {
         size_t i;
         for (i = 1; i < svec->n; i++) {
@@ -372,32 +371,16 @@ 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)
 {
-    assert(svec->n);
+    ovs_assert(svec->n);
     return svec->names[svec->n - 1];
 }
 
 void
 svec_pop_back(struct svec *svec)
 {
-    assert(svec->n);
+    ovs_assert(svec->n);
     free(svec->names[--svec->n]);
 }