/*
- * Copyright (c) 2009, 2010, 2011 Nicira, Inc.
+ * Copyright (c) 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 "shash.h"
-#include <assert.h>
#include "hash.h"
static struct shash_node *shash_find__(const struct shash *,
{
struct shash_node *node = xmalloc(sizeof *node);
node->name = name;
- node->data = (void *) data;
+ node->data = CONST_CAST(void *, data);
hmap_insert(&sh->map, &node->node, hash);
return node;
}
shash_add_assert(struct shash *sh, const char *name, const void *data)
{
bool added OVS_UNUSED = shash_add_once(sh, name, data);
- assert(added);
+ ovs_assert(added);
}
/* Searches for 'name' in 'sh'. If it does not already exist, adds it along
return NULL;
} else {
void *old_data = node->data;
- node->data = (void *) data;
+ node->data = CONST_CAST(void *, data);
return old_data;
}
}
shash_find_and_delete_assert(struct shash *sh, const char *name)
{
void *data = shash_find_and_delete(sh, name);
- assert(data != NULL);
+ ovs_assert(data != NULL);
return data;
}
SHASH_FOR_EACH (node, sh) {
nodes[i++] = node;
}
- assert(i == n);
+ ovs_assert(i == n);
qsort(nodes, n, sizeof *nodes, compare_nodes_by_name);