Merge of r891-892:

- 64-bit cleanups
 - Other monor fixes and cleanups
 - Docs updates



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/1.0.1.x@893 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2009-06-03 19:15:35 +00:00
parent df32443b8c
commit a89f91d935
7 changed files with 33 additions and 23 deletions
+2 -2
View File
@@ -955,11 +955,11 @@ static void exec_inquiry(struct vdisk_cmd *vcmd)
char dev_id_str[17];
dev_id_num = gen_dev_id_num(dev);
dev_id_len = snprintf(dev_id_str, sizeof(dev_id_str), "%llx",
dev_id_len = snprintf(dev_id_str, sizeof(dev_id_str), "%"PRIx64,
dev_id_num);
if (dev_id_len >= (signed)sizeof(dev_id_str))
dev_id_len = sizeof(dev_id_str) - 1;
TRACE_DBG("dev_id num %llx, str %s, len %d", dev_id_num,
TRACE_DBG("dev_id num %"PRIx64", str %s, len %d", dev_id_num,
dev_id_str, dev_id_len);
if (0 == cmd->cdb[2]) { /* supported vital product data pages */
buf[3] = 3;
+1 -1
View File
@@ -433,7 +433,7 @@ int main(int argc, char **argv)
PRINT_INFO("trace_flag %lx", trace_flag);
#endif
snprintf(dev.usn, sizeof(dev.usn), "%llx", gen_dev_id_num(&dev));
snprintf(dev.usn, sizeof(dev.usn), "%"PRIx64, gen_dev_id_num(&dev));
TRACE_DBG("usn %s", dev.usn);
dev.scst_usr_fd = open(DEV_USER_PATH DEV_USER_NAME, O_RDWR |