git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace most uses of assert by ovs_assert.
[sliver-openvswitch.git]
/
lib
/
dpif-netdev.c
diff --git
a/lib/dpif-netdev.c
b/lib/dpif-netdev.c
index
682dfc9
..
3d9cd85
100644
(file)
--- a/
lib/dpif-netdev.c
+++ b/
lib/dpif-netdev.c
@@
-17,7
+17,6
@@
#include <config.h>
#include "dpif.h"
#include <config.h>
#include "dpif.h"
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@
-160,7
+159,7
@@
static void dp_netdev_execute_actions(struct dp_netdev *,
static struct dpif_netdev *
dpif_netdev_cast(const struct dpif *dpif)
{
static struct dpif_netdev *
dpif_netdev_cast(const struct dpif *dpif)
{
- assert(dpif->dpif_class->open == dpif_netdev_open);
+
ovs_
assert(dpif->dpif_class->open == dpif_netdev_open);
return CONTAINER_OF(dpif, struct dpif_netdev, dpif);
}
return CONTAINER_OF(dpif, struct dpif_netdev, dpif);
}
@@
-289,7
+288,7
@@
dpif_netdev_open(const struct dpif_class *class, const char *name,
if (error) {
return error;
}
if (error) {
return error;
}
- assert(dp != NULL);
+
ovs_
assert(dp != NULL);
}
} else {
if (dp->class != class) {
}
} else {
if (dp->class != class) {
@@
-337,7
+336,7
@@
static void
dpif_netdev_close(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
dpif_netdev_close(struct dpif *dpif)
{
struct dp_netdev *dp = get_dp_netdev(dpif);
- assert(dp->open_cnt > 0);
+
ovs_
assert(dp->open_cnt > 0);
if (--dp->open_cnt == 0 && dp->destroyed) {
shash_find_and_delete(&dp_netdevs, dp->name);
dp_netdev_free(dp);
if (--dp->open_cnt == 0 && dp->destroyed) {
shash_find_and_delete(&dp_netdevs, dp->name);
dp_netdev_free(dp);