diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2022-09-18 02:14:13 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2022-09-18 02:14:13 +0000 |
| commit | ccefa8190c1f38cb71384bcdd786599db7de570a (patch) | |
| tree | a4f0c0db16e15ce55ed98460635040b755a26cf3 /src/sg_vpd.c | |
| parent | eda37108f2a83c7944b1c0f63162647eddc9960d (diff) | |
| download | sg3_utils-ccefa8190c1f38cb71384bcdd786599db7de570a.tar.gz | |
sg_inq+sg_vpd: ongoing JSON updates
Probably at the end of the JSON work for sg_inq since
it only has four vendor specific VPD pages. sg_vpd has
a lot more vendor specific VPD pages which are yet to
be 'jsonified'.
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@971 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_vpd.c')
| -rw-r--r-- | src/sg_vpd.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/sg_vpd.c b/src/sg_vpd.c index 707d3e12..35de6ca4 100644 --- a/src/sg_vpd.c +++ b/src/sg_vpd.c @@ -42,7 +42,7 @@ */ -static const char * version_str = "1.82 20220826"; /* spc6r06 + sbc5r03 */ +static const char * version_str = "1.83 20220915"; /* spc6r06 + sbc5r03 */ #define MY_NAME "sg_vpd" @@ -444,17 +444,6 @@ device_id_vpd_variants(uint8_t * buff, int len, int subvalue, } } -static int -no_ascii_4hex(const struct opts_t * op) -{ - if (op->do_hex < 2) - return 1; - else if (2 == op->do_hex) - return 0; - else - return -1; -} - static void /* VPD_SUPPORTED_VPDS ["sv"] */ decode_supported_vpd_4vpd(uint8_t * buff, int len, struct opts_t * op, sgj_opaque_p jap) @@ -1100,16 +1089,6 @@ svpd_unable_to_decode(int sg_fd, struct opts_t * op, int subvalue, int off) } } else hex2stdout(rp, len, no_ascii_4hex(op)); -#if 0 - if (op->do_hex > 1) - hex2stdout(rp, len, -1); - else if (VPD_ASCII_OP_DEF == op->vpd_pn) - hex2stdout(rp, len, 0); - else if (1 == op->do_hex) - hex2stdout(rp, len, (op->do_long ? 0 : 1)); - else - hex2stdout(rp, len, 0); -#endif } } else if ((! op->do_quiet) && (! op->examine_given)) { if (op->vpd_pn >= 0) |