reverse out printf(%#) change, broken for %#02x when value is 0

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

1 files changed, 25 insertions, 25 deletions

diff --git a/src/sg_modes.c b/src/sg_modes.c
index c53fdaae..0ac1820f 100644
--- a/src/sg_modes.c
+++ b/src/sg_modes.c
@@ -26,7 +26,7 @@
 
 */
 
-static char * version_str = "1.31 20090717";
+static char * version_str = "1.31 20090604";
 
 #define DEF_ALLOC_LEN (1024 * 4)
 #define DEF_6_ALLOC_LEN 252
@@ -294,7 +294,7 @@ process_cl_new(struct opts_t * optsp, int argc, char * argv[])
             ++optsp->do_version;
             break;
         default:
-            fprintf(stderr, "unrecognised option code %c [%#x]\n", c, c);
+            fprintf(stderr, "unrecognised option code %c [0x%x]\n", c, c);
             if (optsp->do_help)
                 break;
             usage();
@@ -769,27 +769,27 @@ list_page_codes(int scsi_ptype, int inq_byte6, int t_proto)
             dp = (--num <= 0) ? NULL : (dp + 1); /* skip protocol specific */
         else if (c == d) {
             if (pe_dp->subpage_code)
-                printf(" %#02x,%#02x    *  %s\n", pe_dp->page_code,
+                printf(" 0x%02x,0x%02x    *  %s\n", pe_dp->page_code,
                        pe_dp->subpage_code, pe_dp->desc);
             else
-                printf(" %#02x         *  %s\n", pe_dp->page_code,
+                printf(" 0x%02x         *  %s\n", pe_dp->page_code,
                        pe_dp->desc);
             dp = (--num <= 0) ? NULL : (dp + 1);
             pe_dp = (--num_ptype <= 0) ? NULL : (pe_dp + 1);
         } else if (c < d) {
             if (dp->subpage_code)
-                printf(" %#02x,%#02x       %s\n", dp->page_code,
+                printf(" 0x%02x,0x%02x       %s\n", dp->page_code,
                        dp->subpage_code, dp->desc);
             else
-                printf(" %#02x            %s\n", dp->page_code,
+                printf(" 0x%02x            %s\n", dp->page_code,
                        dp->desc);
             dp = (--num <= 0) ? NULL : (dp + 1);
         } else {
             if (pe_dp->subpage_code)
-                printf(" %#02x,%#02x       %s\n", pe_dp->page_code,
+                printf(" 0x%02x,0x%02x       %s\n", pe_dp->page_code,
                        pe_dp->subpage_code, pe_dp->desc);
             else
-                printf(" %#02x            %s\n", pe_dp->page_code,
+                printf(" 0x%02x            %s\n", pe_dp->page_code,
                        pe_dp->desc);
             pe_dp = (--num_ptype <= 0) ? NULL : (pe_dp + 1);
         }
@@ -802,10 +802,10 @@ list_page_codes(int scsi_ptype, int inq_byte6, int t_proto)
         dp = mode_page_cs_table(0xd, &num);
         while (dp) {
             if (dp->subpage_code)
-                printf(" %#02x,%#02x       %s\n", dp->page_code,
+                printf(" 0x%02x,0x%02x       %s\n", dp->page_code,
                        dp->subpage_code, dp->desc);
             else
-                printf(" %#02x            %s\n", dp->page_code,
+                printf(" 0x%02x            %s\n", dp->page_code,
                        dp->desc);
             dp = (--num <= 0) ? NULL : (dp + 1);
         }
@@ -816,10 +816,10 @@ list_page_codes(int scsi_ptype, int inq_byte6, int t_proto)
         dp = mode_page_cs_table(0x8, &num);
         while (dp) {
             if (dp->subpage_code)
-                printf(" %#02x,%#02x       %s\n", dp->page_code,
+                printf(" 0x%02x,0x%02x       %s\n", dp->page_code,
                        dp->subpage_code, dp->desc);
             else
-                printf(" %#02x            %s\n", dp->page_code,
+                printf(" 0x%02x            %s\n", dp->page_code,
                        dp->desc);
             dp = (--num <= 0) ? NULL : (dp + 1);
         }
@@ -830,10 +830,10 @@ list_page_codes(int scsi_ptype, int inq_byte6, int t_proto)
         dp = mode_page_transp_table(t_proto, &num);
         while (dp) {
             if (dp->subpage_code)
-                printf(" %#02x,%#02x       %s\n", dp->page_code,
+                printf(" 0x%02x,0x%02x       %s\n", dp->page_code,
                        dp->subpage_code, dp->desc);
             else
-                printf(" %#02x            %s\n", dp->page_code,
+                printf(" 0x%02x            %s\n", dp->page_code,
                        dp->desc);
             dp = (--num <= 0) ? NULL : (dp + 1);
         }
@@ -890,7 +890,7 @@ examine_pages(int sg_fd, int inq_pdt, int inq_byte6,
             if (cp)
                 printf("    %s\n", cp);
             else
-                printf("    [%#x]\n", k);
+                printf("    [0x%x]\n", k);
             if (optsp->do_hex)
                 dStrHex((const char *)rbuf, len, 1);
         }
@@ -1021,7 +1021,7 @@ main(int argc, char * argv[])
     inq_pdt = inq_out.peripheral_type;
     inq_byte6 = inq_out.byte_6;
     if (0 == opts.do_raw)
-        printf("    %.8s  %.16s  %.4s   peripheral_type: %s [%#x]\n",
+        printf("    %.8s  %.16s  %.4s   peripheral_type: %s [0x%x]\n",
                inq_out.vendor, inq_out.product, inq_out.revision,
                sg_get_pdt_str(inq_pdt, sizeof(pdt_name), pdt_name), inq_pdt);
     if (opts.do_list) {
@@ -1083,7 +1083,7 @@ main(int argc, char * argv[])
                     "page control (PC) not supported)\n");
         else
             fprintf(stderr, "invalid field in cdb (perhaps "
-                "page %#x not supported)\n", opts.pg_code);
+                "page 0x%x not supported)\n", opts.pg_code);
     } else if (SG_LIB_CAT_NOT_READY == res)
         fprintf(stderr, "device not ready\n");
     else if (SG_LIB_CAT_UNIT_ATTENTION == res)
@@ -1160,12 +1160,12 @@ main(int argc, char * argv[])
         } else if (opts.do_hex > 1)
             dStrHex((const char *)rsp_buff, headerlen, 1);
         if (0 == inq_pdt)
-            printf("  Mode data length=%d, medium type=%#.2x, WP=%d,"
+            printf("  Mode data length=%d, medium type=0x%.2x, WP=%d,"
                    " DpoFua=%d, longlba=%d\n", md_len, medium_type,
                    !!(specific & 0x80), !!(specific & 0x10), longlba);
         else
-            printf("  Mode data length=%d, medium type=%#.2x, specific"
-                   " param=%#.2x, longlba=%d\n", md_len, medium_type,
+            printf("  Mode data length=%d, medium type=0x%.2x, specific"
+                   " param=0x%.2x, longlba=%d\n", md_len, medium_type,
                    specific, longlba);
         if (md_len > rsp_buff_size) {
             printf("Only fetched %d bytes of response, truncate output\n",
@@ -1195,7 +1195,7 @@ main(int argc, char * argv[])
 
                 ucp = rsp_buff + headerlen;
                 while (num > 0) {
-                    printf("   Density code=%#x\n",
+                    printf("   Density code=0x%x\n",
                            *(ucp + density_code_off));
                     dStrHex((const char *)ucp, len, 1);
                     ucp += len;
@@ -1230,10 +1230,10 @@ main(int argc, char * argv[])
             }
             if (opts.do_hex) {
                 if (spf)
-                    printf(">> page_code=%#x, subpage_code=%#x, page_cont"
+                    printf(">> page_code=0x%x, subpage_code=0x%x, page_cont"
                            "rol=%d\n", page_num, ucp[1], opts.page_control);
                 else
-                    printf(">> page_code=%#x, page_control=%d\n", page_num,
+                    printf(">> page_code=0x%x, page_control=%d\n", page_num,
                            opts.page_control);
             } else {
                 descp = NULL;
@@ -1246,10 +1246,10 @@ main(int argc, char * argv[])
                                                 inq_pdt, inq_byte6, -1);
                 if (NULL == descp) {
                     if (spf)
-                        snprintf(ebuff, EBUFF_SZ, "%#x, subpage_code: %#x",
+                        snprintf(ebuff, EBUFF_SZ, "0x%x, subpage_code: 0x%x",
                                  page_num, ucp[1]);
                     else
-                        snprintf(ebuff, EBUFF_SZ, "%#x", page_num);
+                        snprintf(ebuff, EBUFF_SZ, "0x%x", page_num);
                 }
                 if (descp)
                     printf(">> %s, page_control: %s\n", descp,