diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2022-07-29 15:09:18 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2022-07-29 15:09:18 +0000 |
commit | 640f7a7eff809159d9ac4c3ffc3681a6a5c3bede (patch) | |
tree | b889f3d3a995b9ed8eed68a3bd83c75a484df174 /src/sg_get_lba_status.c | |
parent | aac31a343f55c0b40b7d46ba453201fff3430acb (diff) | |
download | sg3_utils-640f7a7eff809159d9ac4c3ffc3681a6a5c3bede.tar.gz |
cleanup warning and C++20 building issues
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@963 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_get_lba_status.c')
-rw-r--r-- | src/sg_get_lba_status.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/sg_get_lba_status.c b/src/sg_get_lba_status.c index 4ed45c81..3acf07b0 100644 --- a/src/sg_get_lba_status.c +++ b/src/sg_get_lba_status.c @@ -35,7 +35,7 @@ * device. */ -static const char * version_str = "1.29 20220717"; /* sbc5r01 */ +static const char * version_str = "1.30 20220729"; /* sbc5r01 */ #define MY_NAME "sg_get_lba_status" @@ -629,7 +629,7 @@ start_response: sgj_js_nv_istr(jsp, jo2p, add_stat_s, add_status, NULL, get_pr_status_str(add_status, b, blen)); } else { - char c[64]; + char d[64]; n = 0; n += sg_scnpr(b + n, blen - n, "[%d] LBA: 0x", k + 1); @@ -637,16 +637,16 @@ start_response: n += sg_scnpr(b + n, blen - n, "%02x", bp[j]); if (1 == (blockhex % 2)) { - snprintf(c, sizeof(c), "0x%x", d_blocks); - n += sg_scnpr(b + n, blen - n, " blocks: %10s", c); + snprintf(d, sizeof(d), "0x%x", d_blocks); + n += sg_scnpr(b + n, blen - n, " blocks: %10s", d); } else n += sg_scnpr(b + n, blen - n, " blocks: %10u", (unsigned int)d_blocks); - get_prov_status_str(res, c, sizeof(c)); - n += sg_scnpr(b + n, blen - n, " %s", c); - get_pr_status_str(add_status, c, sizeof(c)); - if (strlen(c) > 0) - n += sg_scnpr(b + n, blen - n, " [%s]", c); + get_prov_status_str(res, d, sizeof(d)); + n += sg_scnpr(b + n, blen - n, " %s", d); + get_pr_status_str(add_status, d, sizeof(d)); + if (strlen(d) > 0) + n += sg_scnpr(b + n, blen - n, " [%s]", d); sgj_pr_hr(jsp, "%s\n", b); } } @@ -663,8 +663,6 @@ error: else if (SG_LIB_CAT_ILLEGAL_REQ == res) pr2serr("Get LBA Status command: bad field in cdb\n"); else { - char b[80]; - sg_get_category_sense_str(res, sizeof(b), b, verbose); pr2serr("Get LBA Status command: %s\n", b); } |