/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * 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 *,
- const char *name, size_t hash);
+ const char *name, size_t name_len,
+ size_t hash);
static size_t
hash_name(const char *name)
{
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
size_t hash = hash_name(name);
struct shash_node *node;
- node = shash_find__(sh, name, hash);
+ node = shash_find__(sh, name, strlen(name), hash);
if (!node) {
shash_add_nocopy__(sh, xstrdup(name), data, hash);
return NULL;
} else {
void *old_data = node->data;
- node->data = (void *) data;
+ node->data = CONST_CAST(void *, data);
return old_data;
}
}
+/* Deletes 'node' from 'sh' and frees the node's name. The caller is still
+ * responsible for freeing the node's data, if necessary. */
void
shash_delete(struct shash *sh, struct shash_node *node)
{
+ free(shash_steal(sh, node));
+}
+
+/* Deletes 'node' from 'sh'. Neither the node's name nor its data is freed;
+ * instead, ownership is transferred to the caller. Returns the node's
+ * name. */
+char *
+shash_steal(struct shash *sh, struct shash_node *node)
+{
+ char *name = node->name;
+
hmap_remove(&sh->map, &node->node);
- free(node->name);
free(node);
+ return name;
}
static struct shash_node *
-shash_find__(const struct shash *sh, const char *name, size_t hash)
+shash_find__(const struct shash *sh, const char *name, size_t name_len,
+ size_t hash)
{
struct shash_node *node;
- HMAP_FOR_EACH_WITH_HASH (node, struct shash_node, node, hash, &sh->map) {
- if (!strcmp(node->name, name)) {
+ HMAP_FOR_EACH_WITH_HASH (node, node, hash, &sh->map) {
+ if (!strncmp(node->name, name, name_len) && !node->name[name_len]) {
return node;
}
}
struct shash_node *
shash_find(const struct shash *sh, const char *name)
{
- return shash_find__(sh, name, hash_name(name));
+ return shash_find__(sh, name, strlen(name), hash_name(name));
+}
+
+/* Finds and returns a shash_node within 'sh' that has the given 'name' that is
+ * exactly 'len' bytes long. Returns NULL if no node in 'sh' has that name. */
+struct shash_node *
+shash_find_len(const struct shash *sh, const char *name, size_t len)
+{
+ return shash_find__(sh, name, len, hash_bytes(name, len, 0));
}
void *
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);