sg_logs: make merger cleaner, don't add [pg,0xff] unless it appears in one of the supported pages

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

2 files changed, 3 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index da41cca8..1c7b79e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@ Each utility has its own version number, date of last change and
 some description at the top of its ".c" file. All utilities in the main
 directory have their own "man" pages. There is also a sg3_utils man page.
 
-Changelog for pre-release sg3_utils-1.48 [20211226] [svn: r926]
+Changelog for pre-release sg3_utils-1.48 [20211227] [svn: r927]
   - sg_z_act_query: new utility for sending either a
     Zone activate or Zone query command
   - sg_rep_zones: add Report zone starting LBA granularity
diff --git a/src/sg_logs.c b/src/sg_logs.c
index b6515bb9..a5b22f85 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.89 20211226";    /* spc6r06 + sbc5r01 */
+static const char * version_str = "1.90 20211227";    /* spc6r06 + sbc5r01 */
 
 #define MX_ALLOC_LEN (0xfffc)
 #define SHORT_RESP_LEN 128
@@ -6911,7 +6911,7 @@ merge_both_supported(const uint8_t * supp_pgs_p, int su_p_pg_len, int pg_len)
 {
     uint8_t pg;
     int k, kp, ks;
-    int max_blen = (4 * su_p_pg_len) + pg_len;
+    int max_blen = (2 * su_p_pg_len) + pg_len;
     uint8_t * m_buff = rsp_buff + (rsp_buff_sz - pg_len);
     uint8_t * r_buff = rsp_buff + 4;
 
@@ -6935,9 +6935,6 @@ merge_both_supported(const uint8_t * supp_pgs_p, int su_p_pg_len, int pg_len)
             } else {
                 r_buff[k] = pg;
                 r_buff[k + 1] = 0;
-                k += 2;
-                r_buff[k] = pg;
-                r_buff[k + 1] = 0xff;
                 ++kp;
             }
         } else {
@@ -6945,9 +6942,6 @@ merge_both_supported(const uint8_t * supp_pgs_p, int su_p_pg_len, int pg_len)
                 break;
             r_buff[k] = pg;
             r_buff[k + 1] = 0;
-            k += 2;
-            r_buff[k] = pg;
-            r_buff[k + 1] = 0xff;
             ++kp;
         }
     }