diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2022-06-25 04:05:14 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2022-06-25 04:05:14 +0000 |
| commit | 2e225c87784735360e9619766efe06782179a86a (patch) | |
| tree | 1df2832c733c55207261b829ec7f0146287afe82 /src/sg_get_elem_status.c | |
| parent | a3eb530bb4b93949287f19a2b6fb418901f1f699 (diff) | |
| download | sg3_utils-2e225c87784735360e9619766efe06782179a86a.tar.gz | |
sg_rem_rest_elem: new utility for removing or restoring elements; bug fixes
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@955 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_get_elem_status.c')
| -rw-r--r-- | src/sg_get_elem_status.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/sg_get_elem_status.c b/src/sg_get_elem_status.c index 47e18a99..fc46608a 100644 --- a/src/sg_get_elem_status.c +++ b/src/sg_get_elem_status.c @@ -37,11 +37,10 @@ * given SCSI device. */ -static const char * version_str = "1.10 20220527"; /* sbc5r01 */ +static const char * version_str = "1.11 20220616"; /* sbc5r01 */ #define MY_NAME "sg_get_elem_status" - #ifndef UINT32_MAX #define UINT32_MAX ((uint32_t)-1) #endif @@ -549,12 +548,12 @@ start_response: goto fini; } - sgj_pr_twin_vi(jsp, jop, 0, "Number of descriptors", - SGJ_SEP_COLON_1_SPACE, num_desc); - sgj_pr_twin_vi(jsp, jop, 0, "Number of descriptors returned", - SGJ_SEP_COLON_1_SPACE, num_desc_ret); - sgj_pr_twin_vi(jsp, jop, 0, "Identifier of element being depopulated", - SGJ_SEP_COLON_1_SPACE, id_elem_depop); + sgj_pr_hr_js_vi(jsp, jop, 0, "Number of descriptors", + SGJ_SEP_COLON_1_SPACE, num_desc); + sgj_pr_hr_js_vi(jsp, jop, 0, "Number of descriptors returned", + SGJ_SEP_COLON_1_SPACE, num_desc_ret); + sgj_pr_hr_js_vi(jsp, jop, 0, "Identifier of element being depopulated", + SGJ_SEP_COLON_1_SPACE, id_elem_depop); if (rlen < 64) { sgj_pr_hr(jsp, "No complete physical element status descriptors " "available\n"); @@ -575,18 +574,18 @@ start_response: decode_elem_status_desc(bp, &a_ped); if (jsp->pr_as_json) { jo2p = sgj_new_unattached_object(jsp); - sgj_add_name_pair_ihex(jsp, jo2p, "element_identifier", - (int64_t)a_ped.elem_id); + sgj_add_nv_ihex(jsp, jo2p, "element_identifier", + (int64_t)a_ped.elem_id); cp = (1 == a_ped.phys_elem_type) ? "storage" : "reserved"; - sgj_add_name_pair_istr(jsp, jo2p, "physical_element_type", - a_ped.phys_elem_type, "meaning", cp); + sgj_add_nv_istr(jsp, jo2p, "physical_element_type", + a_ped.phys_elem_type, "meaning", cp); j = a_ped.phys_elem_health; fetch_health_str(j, b, blen); - sgj_add_name_pair_istr(jsp, jo2p, "physical_element_health", j, - "meaning", b); - sgj_add_name_pair_ihex(jsp, jo2p, "associated_capacity", - (int64_t)a_ped.assoc_cap); - sgj_add_val_o(jsp, jap, NULL /* name */, jo2p); + sgj_add_nv_istr(jsp, jo2p, "physical_element_health", j, + "meaning", b); + sgj_add_nv_ihex(jsp, jo2p, "associated_capacity", + (int64_t)a_ped.assoc_cap); + sgj_add_nv_o(jsp, jap, NULL /* name */, jo2p); } else if (do_brief) { sgj_pr_hr(jsp, "%u: %u,%u\n", a_ped.elem_id, a_ped.phys_elem_type, a_ped.phys_elem_health); |