aboutsummaryrefslogtreecommitdiff
path: root/lib/hmapx.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-11-06 13:14:55 -0800
committerBen Pfaff <blp@nicira.com>2013-01-16 16:03:37 -0800
commitcb22974d773942d66da42b700b8bca0db27a0920 (patch)
tree6412724be1bfc46d7235c4e2105c279bbe20d320 /lib/hmapx.c
parent4749f73d12c844b318af7f45cf45e1acac9f7c08 (diff)
Replace most uses of assert by ovs_assert.
This is a straight search-and-replace, except that I also removed #include <assert.h> from each file where there were no assert calls left. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'lib/hmapx.c')
-rw-r--r--lib/hmapx.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/hmapx.c b/lib/hmapx.c
index 1c324c4d..0440767c 100644
--- a/lib/hmapx.c
+++ b/lib/hmapx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Nicira, Inc.
+ * Copyright (c) 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.
@@ -18,8 +18,6 @@
#include "hmapx.h"
-#include <assert.h>
-
#include "hash.h"
static struct hmapx_node *
@@ -119,7 +117,7 @@ void
hmapx_add_assert(struct hmapx *map, void *data)
{
bool added OVS_UNUSED = hmapx_add(map, data);
- assert(added);
+ ovs_assert(added);
}
/* Removes all of the nodes from 'map'. */
@@ -159,7 +157,7 @@ void
hmapx_find_and_delete_assert(struct hmapx *map, const void *data)
{
bool deleted OVS_UNUSED = hmapx_find_and_delete(map, data);
- assert(deleted);
+ ovs_assert(deleted);
}
/* Searches for 'data' in 'map'. Returns its node, if found, otherwise a null