mirror of
https://github.com/openvswitch/ovs
synced 2025-08-31 14:25:26 +00:00
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>
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#include <config.h>
|
||||
#include "dpif.h"
|
||||
|
||||
#include <assert.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)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -289,7 +288,7 @@ dpif_netdev_open(const struct dpif_class *class, const char *name,
|
||||
if (error) {
|
||||
return error;
|
||||
}
|
||||
assert(dp != NULL);
|
||||
ovs_assert(dp != NULL);
|
||||
}
|
||||
} 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);
|
||||
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);
|
||||
|
Reference in New Issue
Block a user