summaryrefslogtreecommitdiffstats
path: root/sbin/hastd/hast_proto.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-09-27 08:50:37 +0000
committerpjd <pjd@FreeBSD.org>2011-09-27 08:50:37 +0000
commit2c59e5d5437fcd48c72ceeb06f5aacd65ad2e2be (patch)
tree584bd5892a4f1ff05f7f1a3612c8134b8a2506e2 /sbin/hastd/hast_proto.c
parent1f93bdc27f698c83f830a67a9da0f5991ea476fb (diff)
downloadFreeBSD-src-2c59e5d5437fcd48c72ceeb06f5aacd65ad2e2be.zip
FreeBSD-src-2c59e5d5437fcd48c72ceeb06f5aacd65ad2e2be.tar.gz
Use PJDLOG_ASSERT() and PJDLOG_ABORT() everywhere instead of assert().
MFC after: 3 days
Diffstat (limited to 'sbin/hastd/hast_proto.c')
-rw-r--r--sbin/hastd/hast_proto.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c
index 8956891..439b0f3 100644
--- a/sbin/hastd/hast_proto.c
+++ b/sbin/hastd/hast_proto.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
-#include <assert.h>
#include <errno.h>
#include <strings.h>
@@ -158,7 +157,7 @@ hast_proto_recv_hdr(const struct proto_conn *conn, struct nv **nvp)
if (ebuf_add_tail(eb, NULL, hdr.size) < 0)
goto fail;
hptr = ebuf_data(eb, NULL);
- assert(hptr != NULL);
+ PJDLOG_ASSERT(hptr != NULL);
if (proto_recv(conn, hptr, hdr.size) < 0)
goto fail;
nv = nv_ntoh(eb);
@@ -183,8 +182,8 @@ hast_proto_recv_data(const struct hast_resource *res, struct proto_conn *conn,
void *dptr;
int ret;
- assert(data != NULL);
- assert(size > 0);
+ PJDLOG_ASSERT(data != NULL);
+ PJDLOG_ASSERT(size > 0);
ret = -1;
freedata = false;
OpenPOWER on IntegriCloud