Index: head/usr.sbin/ctld/chap.c
===================================================================
--- head/usr.sbin/ctld/chap.c
+++ head/usr.sbin/ctld/chap.c
@@ -232,7 +232,7 @@
 {
 	struct chap *chap;
 
-	chap = calloc(sizeof(*chap), 1);
+	chap = calloc(1, sizeof(*chap));
 	if (chap == NULL)
 		log_err(1, "calloc");
 
@@ -333,7 +333,7 @@
 {
 	struct rchap *rchap;
 
-	rchap = calloc(sizeof(*rchap), 1);
+	rchap = calloc(1, sizeof(*rchap));
 	if (rchap == NULL)
 		log_err(1, "calloc");
 
Index: head/usr.sbin/ctld/keys.c
===================================================================
--- head/usr.sbin/ctld/keys.c
+++ head/usr.sbin/ctld/keys.c
@@ -43,7 +43,7 @@
 {
 	struct keys *keys;
 
-	keys = calloc(sizeof(*keys), 1);
+	keys = calloc(1, sizeof(*keys));
 	if (keys == NULL)
 		log_err(1, "calloc");
 
Index: head/usr.sbin/ctld/pdu.c
===================================================================
--- head/usr.sbin/ctld/pdu.c
+++ head/usr.sbin/ctld/pdu.c
@@ -81,11 +81,11 @@
 {
 	struct pdu *pdu;
 
-	pdu = calloc(sizeof(*pdu), 1);
+	pdu = calloc(1, sizeof(*pdu));
 	if (pdu == NULL)
 		log_err(1, "calloc");
 
-	pdu->pdu_bhs = calloc(sizeof(*pdu->pdu_bhs), 1);
+	pdu->pdu_bhs = calloc(1, sizeof(*pdu->pdu_bhs));
 	if (pdu->pdu_bhs == NULL)
 		log_err(1, "calloc");
 
Index: head/usr.sbin/iscsid/chap.c
===================================================================
--- head/usr.sbin/iscsid/chap.c
+++ head/usr.sbin/iscsid/chap.c
@@ -232,7 +232,7 @@
 {
 	struct chap *chap;
 
-	chap = calloc(sizeof(*chap), 1);
+	chap = calloc(1, sizeof(*chap));
 	if (chap == NULL)
 		log_err(1, "calloc");
 
@@ -333,7 +333,7 @@
 {
 	struct rchap *rchap;
 
-	rchap = calloc(sizeof(*rchap), 1);
+	rchap = calloc(1, sizeof(*rchap));
 	if (rchap == NULL)
 		log_err(1, "calloc");
 
Index: head/usr.sbin/iscsid/keys.c
===================================================================
--- head/usr.sbin/iscsid/keys.c
+++ head/usr.sbin/iscsid/keys.c
@@ -43,7 +43,7 @@
 {
 	struct keys *keys;
 
-	keys = calloc(sizeof(*keys), 1);
+	keys = calloc(1, sizeof(*keys));
 	if (keys == NULL)
 		log_err(1, "calloc");
 
Index: head/usr.sbin/iscsid/pdu.c
===================================================================
--- head/usr.sbin/iscsid/pdu.c
+++ head/usr.sbin/iscsid/pdu.c
@@ -81,11 +81,11 @@
 {
 	struct pdu *pdu;
 
-	pdu = calloc(sizeof(*pdu), 1);
+	pdu = calloc(1, sizeof(*pdu));
 	if (pdu == NULL)
 		log_err(1, "calloc");
 
-	pdu->pdu_bhs = calloc(sizeof(*pdu->pdu_bhs), 1);
+	pdu->pdu_bhs = calloc(1, sizeof(*pdu->pdu_bhs));
 	if (pdu->pdu_bhs == NULL)
 		log_err(1, "calloc");