File 0085-wdc-Use-const-string-for-suffix.patch of Package nvme-cli

Overview Repositories Revisions Requests Users Attributes Meta

File 0085-wdc-Use-const-string-for-suffix.patch of Package nvme-cli (Revision ae92a91306e7a3b1140279fd37e16eea)

Currently displaying revision ae92a91306e7a3b1140279fd37e16eea , Show latest

From 860cc70a88a972495047e6724989c7e6bed99329 Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Thu, 25 Oct 2018 12:02:49 -0600
Subject: [PATCH] wdc: Use const string for suffix

Signed-off-by: Keith Busch <keith.busch@intel.com>
---
 plugins/wdc/wdc-nvme.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 8d61fa7..9531e36 100644
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -304,7 +304,7 @@ static NVME_VU_DE_LOGPAGE_LIST deVULogPagesList[] =
     { NVME_DE_LOGPAGE_C0, 0xC0, 512, "0xc0"}
 };
 
-static int wdc_get_serial_name(int fd, char *file, size_t len, char *suffix);
+static int wdc_get_serial_name(int fd, char *file, size_t len, const char *suffix);
 static int wdc_create_log_file(char *file, __u8 *drive_log_data,
 		__u32 drive_log_length);
 static int wdc_do_clear_dump(int fd, __u8 opcode, __u32 cdw12);
@@ -561,7 +561,7 @@ static bool wdc_check_device_match(int fd, int vendor_id, int device_id)
 		return false;
 }
 
-static int wdc_get_serial_name(int fd, char *file, size_t len, char *suffix)
+static int wdc_get_serial_name(int fd, char *file, size_t len, const char *suffix)
 {
 	int i;
 	int ret;
@@ -1141,21 +1141,21 @@ static int wdc_do_crash_dump(int fd, char *file, int type)
 static int wdc_crash_dump(int fd, char *file, int type)
 {
 	char f[PATH_MAX] = {0};
-	char dump_type[PATH_MAX] = {0};
+	const char *dump_type;
 
 	if (file != NULL) {
 		strncpy(f, file, PATH_MAX - 1);
 	}
 
 	if (type == WDC_NVME_PFAIL_DUMP_TYPE)
-		strncpy(dump_type, "_pfail_dump", PATH_MAX - 1);
+		dump_type = "_pfail_dump";
 	else
-		strncpy(dump_type, "_crash_dump", PATH_MAX - 1);
+		dump_type = "_crash_dump";
 
 	if (wdc_get_serial_name(fd, f, PATH_MAX, dump_type) == -1) {
 		fprintf(stderr, "ERROR : WDC : failed to generate file name\n");
 		return -1;
-	    }
+	}
 	return wdc_do_crash_dump(fd, f, type);
 }
 
-- 
2.13.7

Places

File 0085-wdc-Use-const-string-for-suffix.patch of Package nvme-cli (Revision ae92a91306e7a3b1140279fd37e16eea)

Places