diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2022-02-25 16:52:17 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2022-02-25 16:53:53 +0000 |
| commit | f00ced06da25540c2057e46033d1c38b4ade7c8b (patch) | |
| tree | c3ee99113485628cd27ade3b634a874b01f9beea | |
| parent | 16ee5cd15ad09520c03f9f222f4400507f1a82d7 (diff) | |
| download | src-f00ced06da25540c2057e46033d1c38b4ade7c8b.tar.gz src-f00ced06da25540c2057e46033d1c38b4ade7c8b.zip | |
CTL: Rework 05c3e8e87142 using %zu format.
MFC after: 2 days
| -rw-r--r-- | sys/cam/ctl/ctl.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index d6859716bcaa..6d06d4f5ad14 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -1104,8 +1104,8 @@ ctl_isc_ua(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t iid; if (len < sizeof(msg->ua)) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)sizeof(msg->ua)); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, sizeof(msg->ua)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1145,15 +1145,15 @@ ctl_isc_lun_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t targ_lun; if (len < offsetof(struct ctl_ha_msg_lun, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_lun, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->lun.lun_devid_len + msg->lun.pr_key_count * sizeof(pr_key); if (len < offsetof(struct ctl_ha_msg_lun, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_lun, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_lun, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1229,8 +1229,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, new; if (len < offsetof(struct ctl_ha_msg_port, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_port, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1238,8 +1238,8 @@ ctl_isc_port_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) msg->port.port_devid_len + msg->port.target_devid_len + msg->port.init_devid_len; if (len < offsetof(struct ctl_ha_msg_port, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_port, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_port, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1358,15 +1358,15 @@ ctl_isc_iid_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) int i, iid; if (len < offsetof(struct ctl_ha_msg_iid, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_iid, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->iid.name_len; if (len < offsetof(struct ctl_ha_msg_iid, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_iid, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_iid, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1396,8 +1396,8 @@ ctl_isc_login(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) { if (len < sizeof(msg->login)) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)sizeof(msg->login)); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, sizeof(msg->login)); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } @@ -1436,15 +1436,15 @@ ctl_isc_mode_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len) uint32_t initidx, targ_lun; if (len < offsetof(struct ctl_ha_msg_mode, data[0])) { - printf("%s: Received truncated message %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[0])); + printf("%s: Received truncated message %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_mode, data[0])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } i = msg->mode.page_len; if (len < offsetof(struct ctl_ha_msg_mode, data[i])) { - printf("%s: Received truncated message data %d < %d\n", - __func__, len, (int)offsetof(struct ctl_ha_msg_mode, data[i])); + printf("%s: Received truncated message data %d < %zu\n", + __func__, len, offsetof(struct ctl_ha_msg_mode, data[i])); ctl_ha_msg_abort(CTL_HA_CHAN_CTL); return; } |