diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2021-12-27 17:18:45 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2021-12-27 17:18:45 +0000 |
| commit | a80fb97517110b355fe16a190328699d6bd9ca17 (patch) | |
| tree | 5ee18e94025149a6f6a24c83382ac32be3525578 /src | |
| parent | bb578d34bcbb417806c24a58d4e6771e820579aa (diff) | |
| download | sg3_utils-a80fb97517110b355fe16a190328699d6bd9ca17.tar.gz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/sg_logs.c | 10 |
1 files changed, 2 insertions, 8 deletions
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; } } |