diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-10-30 14:13:15 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-10-30 14:13:15 +0000 |
| commit | 46fc599e6613db02a8024301592f7430e1527578 (patch) | |
| tree | 7d23610375c8c6df24b5ffb290acd05ee5028462 /lib/libcam | |
| parent | 14bec3e02667bdc413936089c9a3a4ab3bb8146d (diff) | |
| download | FreeBSD-src-46fc599e6613db02a8024301592f7430e1527578.zip FreeBSD-src-46fc599e6613db02a8024301592f7430e1527578.tar.gz | |
printf() specifier updates to CAM to handle either 32-bit or 64-bit lun_id_t.
MFC after: 2 weeks
Diffstat (limited to 'lib/libcam')
| -rw-r--r-- | lib/libcam/camlib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index cd59922..8bac6f5 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -348,16 +348,16 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun, if (ccb.cdm.status == CAM_DEV_MATCH_MORE) { snprintf(cam_errbuf, CAM_ERRBUF_SIZE, "%s: CDM reported more than one" - " passthrough device at %d:%d:%d!!\n", - func_name, path_id, target_id, target_lun); + " passthrough device at %d:%d:%jx!!\n", + func_name, path_id, target_id, (uintmax_t)target_lun); goto btl_bailout; } if (ccb.cdm.num_matches == 0) { snprintf(cam_errbuf, CAM_ERRBUF_SIZE, "%s: no passthrough device found at" - " %d:%d:%d", func_name, path_id, target_id, - target_lun); + " %d:%d:%jx", func_name, path_id, target_id, + (uintmax_t)target_lun); goto btl_bailout; } @@ -687,14 +687,14 @@ cam_path_string(struct cam_device *dev, char *str, int len) return(str); } - snprintf(str, len, "(%s%d:%s%d:%d:%d:%d): ", + snprintf(str, len, "(%s%d:%s%d:%d:%d:%jx): ", (dev->device_name[0] != '\0') ? dev->device_name : "pass", dev->dev_unit_num, (dev->sim_name[0] != '\0') ? dev->sim_name : "unknown", dev->sim_unit_number, dev->bus_id, dev->target_id, - dev->target_lun); + (uintmax_t)dev->target_lun); return(str); } |
