Use unique names for VULs, also return 0 on success

Previously nvme_log_id_to_string returned "WDC Vendor Unique Log ID" if
it was any vendor unique log ID. This causes problems when requesting
JSON output, as only the final vendor unique log ID would be shown.
Instead, append the log id to the string making each unique.

Also, wdc_log_page_directory previously returned whatever the
output_format was. Instead return 0 if the format was valid.

Signed-off-by: Brandon Paupore <brandon.paupore@wdc.com>

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 826a81e1f23aebcdc5f920a232b168bf41f796bc..bc0a9c058b444069fe55ee5b3ac19b090ccb2643 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -7310,25 +7310,25 @@ static const char *nvme_log_id_to_string(__u8 log_id)
                case NVME_LOG_LID_RESERVATION:      return "Reservation Notification Log ID";
                case NVME_LOG_LID_SANITIZE:         return "Sanitize Status Log ID";
 
-               case WDC_LOG_ID_C0:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C1:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C2:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C4:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C5:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C6:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_C8:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_CA:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_CB:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_D0:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_D1:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_D6:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_D7:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_D8:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_DE:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_F0:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_F1:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_F2:             return "WDC Vendor Unique Log ID";
-               case WDC_LOG_ID_FA:             return "WDC Vendor Unique Log ID";
+               case WDC_LOG_ID_C0:             return "WDC Vendor Unique Log ID C0";
+               case WDC_LOG_ID_C1:             return "WDC Vendor Unique Log ID C1";
+               case WDC_LOG_ID_C2:             return "WDC Vendor Unique Log ID C2";
+               case WDC_LOG_ID_C4:             return "WDC Vendor Unique Log ID C4";
+               case WDC_LOG_ID_C5:             return "WDC Vendor Unique Log ID C5";
+               case WDC_LOG_ID_C6:             return "WDC Vendor Unique Log ID C6";
+               case WDC_LOG_ID_C8:             return "WDC Vendor Unique Log ID C8";
+               case WDC_LOG_ID_CA:             return "WDC Vendor Unique Log ID CA";
+               case WDC_LOG_ID_CB:             return "WDC Vendor Unique Log ID CB";
+               case WDC_LOG_ID_D0:             return "WDC Vendor Unique Log ID D0";
+               case WDC_LOG_ID_D1:             return "WDC Vendor Unique Log ID D1";
+               case WDC_LOG_ID_D6:             return "WDC Vendor Unique Log ID D6";
+               case WDC_LOG_ID_D7:             return "WDC Vendor Unique Log ID D7";
+               case WDC_LOG_ID_D8:             return "WDC Vendor Unique Log ID D8";
+               case WDC_LOG_ID_DE:             return "WDC Vendor Unique Log ID DE";
+               case WDC_LOG_ID_F0:             return "WDC Vendor Unique Log ID F0";
+               case WDC_LOG_ID_F1:             return "WDC Vendor Unique Log ID F1";
+               case WDC_LOG_ID_F2:             return "WDC Vendor Unique Log ID F2";
+               case WDC_LOG_ID_FA:             return "WDC Vendor Unique Log ID FA";
 
                default:                        return "Unknown Log ID";
        }
@@ -7367,6 +7367,7 @@ static int wdc_log_page_directory(int argc, char **argv, struct command *command
                fprintf(stderr, "%s: ERROR : WDC : invalid output format\n", __func__);
                return ret;
        }
+       ret = 0;
 
        r = nvme_scan(NULL);
        capabilities = wdc_get_drive_capabilities(r, fd);