mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 06:45:17 +00:00
Code Issues Releases Wiki Activity

Replace most uses of assert by ovs_assert.

Browse Source 
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:
Ben Pfaff
2012-11-06 13:14:55 -08:00
parent 4749f73d12
commit cb22974d77
85 changed files with 393 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/socket-util.c
View File

@@ -17,7 +17,6 @@
#include <config.h>
#include "socket-util.h"
#include <arpa/inet.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <net/if.h>
@@ -1101,7 +1100,7 @@ send_iovec_and_fds(int sock,
const struct iovec *iovs, size_t n_iovs,
const int fds[], size_t n_fds)
{
assert(sock >= 0);
ovs_assert(sock >= 0);
if (n_fds > 0) {
union {
struct cmsghdr cm;
@@ -1109,8 +1108,8 @@ send_iovec_and_fds(int sock,
} cmsg;
struct msghdr msg;
assert(!iovec_is_empty(iovs, n_iovs));
assert(n_fds <= SOUTIL_MAX_FDS);
ovs_assert(!iovec_is_empty(iovs, n_iovs));
ovs_assert(n_fds <= SOUTIL_MAX_FDS);
memset(&cmsg, 0, sizeof cmsg);
cmsg.cm.cmsg_len = CMSG_LEN(n_fds * sizeof *fds);
@@ -1285,7 +1284,7 @@ recv_data_and_fds(int sock,
size_t n_fds = (p->cmsg_len - CMSG_LEN(0)) / sizeof *fds;
const int *fds_data = (const int *) CMSG_DATA(p);
assert(n_fds > 0);
ovs_assert(n_fds > 0);
if (n_fds > SOUTIL_MAX_FDS) {
VLOG_ERR("%zu fds received but only %d supported",
n_fds, SOUTIL_MAX_FDS);