diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2009-07-24 19:58:51 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2009-07-24 19:58:51 +0000 |
| commit | 7a31f052e8013960cc162447397ca552ff50dfb2 (patch) | |
| tree | dae6957e16343aa34d23a8f639fc9f8be37e875a /src/sg_readcap.c | |
| parent | 42a33ce7e76f90eea8e60d7efbd65a44b1f0c65a (diff) | |
| download | sg3_utils-7a31f052e8013960cc162447397ca552ff50dfb2.tar.gz | |
reverse out printf(%#) change, broken for %#02x when value is 0
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@284 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_readcap.c')
| -rw-r--r-- | src/sg_readcap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sg_readcap.c b/src/sg_readcap.c index 5ad0fdc2..f0433ede 100644 --- a/src/sg_readcap.c +++ b/src/sg_readcap.c @@ -28,7 +28,7 @@ */ -static char * version_str = "3.84 20090717"; +static char * version_str = "3.84 20090422"; #define ME "sg_readcap: " @@ -193,7 +193,7 @@ static int process_cl_new(struct opts_t * optsp, int argc, char * argv[]) ++optsp->do_version; break; default: - fprintf(stderr, "unrecognised option code %c [%#x]\n", c, c); + fprintf(stderr, "unrecognised option code %c [0x%x]\n", c, c); if (optsp->do_help) break; usage(); @@ -404,15 +404,15 @@ int main(int argc, char * argv[]) block_size = ((resp_buff[4] << 24) | (resp_buff[5] << 16) | (resp_buff[6] << 8) | resp_buff[7]); if (opts.do_brief) { - printf("%#x %#x\n", last_blk_addr + 1, block_size); + printf("0x%x 0x%x\n", last_blk_addr + 1, block_size); goto good; } printf("Read Capacity results:\n"); if (opts.do_pmi) - printf(" PMI mode: given lba=%#" PRIx64 ", last lba " - "before delay=%#x\n", opts.llba, last_blk_addr); + printf(" PMI mode: given lba=0x%" PRIx64 ", last lba " + "before delay=0x%x\n", opts.llba, last_blk_addr); else - printf(" Last logical block address=%u (%#x), Number " + printf(" Last logical block address=%u (0x%x), Number " "of blocks=%u\n", last_blk_addr, last_blk_addr, last_blk_addr + 1); printf(" Logical block length=%u bytes\n", block_size); @@ -482,7 +482,7 @@ int main(int argc, char * argv[]) block_size = ((resp_buff[8] << 24) | (resp_buff[9] << 16) | (resp_buff[10] << 8) | resp_buff[11]); if (opts.do_brief) { - printf("%#" PRIx64 " %#x\n", llast_blk_addr + 1, block_size); + printf("0x%" PRIx64 " 0x%x\n", llast_blk_addr + 1, block_size); goto good; } printf("Read Capacity results:\n"); @@ -492,11 +492,11 @@ int main(int argc, char * argv[]) printf(" Thin provisioning: tpe=%d, tprz=%d\n", !!(resp_buff[14] & 0x80), !!(resp_buff[14] & 0x40)); if (opts.do_pmi) - printf(" PMI mode: given lba=%#" PRIx64 ", last lba " - "before delay=%#" PRIx64 "\n", opts.llba, + printf(" PMI mode: given lba=0x%" PRIx64 ", last lba " + "before delay=0x%" PRIx64 "\n", opts.llba, llast_blk_addr); else - printf(" Last logical block address=%" PRIu64 " (%#" + printf(" Last logical block address=%" PRIu64 " (0x%" PRIx64 "), Number of logical blocks=%" PRIu64 "\n", llast_blk_addr, llast_blk_addr, llast_blk_addr + 1); printf(" Logical block length=%u bytes\n", block_size); |