/*
- * 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.
#include <config.h>
#include "svec.h"
-#include <assert.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(svec)
+VLOG_DEFINE_THIS_MODULE(svec);
void
svec_init(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 . */
{
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);
}
{
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;
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++) {
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]);
}