rescan-scsi-bus.sh: rev 815 changed the order of listing hosts from numeric to alphabetical, change it back to numeric

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@939 6180dd3e-e324-4e3e-922d-17de1ae2f315

5 files changed, 7 insertions, 11 deletions

diff --git a/src/sg_get_lba_status.c b/src/sg_get_lba_status.c
index 4ce9b2ca..dae508a2 100644
--- a/src/sg_get_lba_status.c
+++ b/src/sg_get_lba_status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021 Douglas Gilbert.
+ * Copyright (c) 2009-2022 Douglas Gilbert.
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
@@ -35,7 +35,7 @@
  * device.
  */
 
-static const char * version_str = "1.23 20211104";      /* sbc4r15 */
+static const char * version_str = "1.24 20220218";      /* sbc4r15 */
 
 #ifndef UINT32_MAX
 #define UINT32_MAX ((uint32_t)-1)
@@ -354,7 +354,6 @@ main(int argc, char * argv[])
                 ret = SG_LIB_SYNTAX_ERROR;
                 goto fini;
             }
-            res = 0;
             goto start_response;
         } else {
             pr2serr("missing device name!\n\n");
diff --git a/src/sg_logs.c b/src/sg_logs.c
index 2fce0b5a..f125878b 100644
--- a/src/sg_logs.c
+++ b/src/sg_logs.c
@@ -36,7 +36,7 @@
 #include "sg_unaligned.h"
 #include "sg_pr2serr.h"
 
-static const char * version_str = "1.94 20220201";    /* spc6r06 + sbc5r01 */
+static const char * version_str = "1.95 20220218";    /* spc6r06 + sbc5r01 */
 
 #define MX_ALLOC_LEN (0xfffc)
 #define SHORT_RESP_LEN 128
@@ -7218,7 +7218,6 @@ main(int argc, char * argv[])
         }
         op->pg_code = PROTO_SPECIFIC_LPAGE;
     }
-    pg_len = 0;
 
     memset(&inq_out, 0, sizeof(inq_out));
     if (op->no_inq < 2) {
diff --git a/src/sg_rep_zones.c b/src/sg_rep_zones.c
index c77bd785..90d744a4 100644
--- a/src/sg_rep_zones.c
+++ b/src/sg_rep_zones.c
@@ -39,7 +39,7 @@
  * Based on zbc2r10.pdf
  */
 
-static const char * version_str = "1.31 20220201";
+static const char * version_str = "1.32 20220218";
 
 #define WILD_RZONES_BUFF_LEN (1 << 28)
 #define MAX_RZONES_BUFF_LEN (2 * 1024 * 1024)
@@ -614,7 +614,6 @@ find_report_zones(int sg_fd, uint8_t * rzBuff, const char * cmd_name,
     const uint8_t * bp = rzBuff;
     char b[96];
 
-    k = 0;
     while (true) {
         resid = 0;
         res = sg_ll_report_zzz(sg_fd, REPORT_ZONES_SA, slba,
diff --git a/src/sg_ses.c b/src/sg_ses.c
index aa545a87..7d43711d 100644
--- a/src/sg_ses.c
+++ b/src/sg_ses.c
@@ -38,7 +38,7 @@
  * commands tailored for SES (enclosure) devices.
  */
 
-static const char * version_str = "2.55 20220127";    /* ses4r04 */
+static const char * version_str = "2.56 20220218";    /* ses4r04 */
 
 #define MX_ALLOC_LEN ((64 * 1024) - 4)  /* max allowable for big enclosures */
 #define MX_ELEM_HDR 1024
@@ -5515,7 +5515,7 @@ enumerate_work(const struct opts_t * op)
                "['es' or 'ec'] page");
         if (op->ind_given && op->ind_etp &&
             (cp = etype_str(op->ind_etp->elem_type_code, bb, sizeof(bb)))) {
-            printf("\n(element type: %s)", bb);
+            printf("\n(element type: %s)", cp);
             given_et = true;
         }
         printf(":\n");
diff --git a/src/sg_vpd.c b/src/sg_vpd.c
index 31954183..9350dbc6 100644
--- a/src/sg_vpd.c
+++ b/src/sg_vpd.c
@@ -40,7 +40,7 @@
 
 */
 
-static const char * version_str = "1.69 20220217";  /* spc6r06 + sbc5r01 */
+static const char * version_str = "1.70 20220218";  /* spc6r06 + sbc5r01 */
 
 /* standard VPD pages, in ascending page number order */
 #define VPD_SUPPORTED_VPDS 0x0
@@ -755,7 +755,6 @@ decode_dev_ids_quiet(uint8_t * buff, int len, int m_assoc,
     uint8_t sas_tport_addr[8];
 
     rtp = 0;
-    u = 0;
     memset(sas_tport_addr, 0, sizeof(sas_tport_addr));
     for (k = 0, off = -1; true; ++k) {
         if ((0 == k) && (0 != buff[2])) {