nvme: standardize nvme_strerror() usage

nvme_strerror() is a useful wrapper function for printing proper
error messages corresponding to error codes including library
specific error codes too. So it would be helpful to standardize
the use of the same here across the codebase.

Signed-off-by: Martin George <[email protected]>

Author: martin-gpy

fabrics.c

@@ -152,7 +152,7 @@ static void save_discovery_log(char *raw, struct nvmf_discovery_log *log)
 
 	fd = open(raw, O_CREAT | O_RDWR | O_TRUNC, 0600);
 	if (fd < 0) {
-		fprintf(stderr, "failed to open %s: %s\n", raw, strerror(errno));
+		fprintf(stderr, "failed to open %s: %s\n", raw, nvme_strerror(errno));
 		return;
 	}
 
@@ -161,7 +161,7 @@ static void save_discovery_log(char *raw, struct nvmf_discovery_log *log)
 	ret = write(fd, log, len);
 	if (ret < 0)
 		fprintf(stderr, "failed to write to %s: %s\n",
-			raw, strerror(errno));
+			raw, nvme_strerror(errno));
 	else
 		printf("Discovery log is saved to %s\n", raw);
 
@@ -183,7 +183,7 @@ static bool cb_decide_retry(struct nvmf_context *fctx, int err,
 		void *user_data)
 {
 	if (err == -EAGAIN || (err == -EINTR && !nvme_sigint_received)) {
-		print_debug("nvmf_add_ctrl returned '%s'\n", strerror(-err));
+		print_debug("nvmf_add_ctrl returned '%s'\n", nvme_strerror(-err));
 		return true;
 	}
 

libnvme/src/nvme/fabrics.c

@@ -846,7 +846,7 @@ static int __nvmf_supported_options(struct nvme_global_ctx *ctx)
 	fd = open(nvmf_dev, O_RDONLY);
 	if (fd < 0) {
 		nvme_msg(ctx, LOG_ERR, "Failed to open %s: %s\n",
-			 nvmf_dev, strerror(errno));
+			 nvmf_dev, nvme_strerror(errno));
 		return -ENVME_CONNECT_OPEN;
 	}
 
@@ -866,7 +866,7 @@ static int __nvmf_supported_options(struct nvme_global_ctx *ctx)
 		}
 
 		nvme_msg(ctx, LOG_ERR, "Failed to read from %s: %s\n",
-			 nvmf_dev, strerror(errno));
+			 nvmf_dev, nvme_strerror(errno));
 		return -ENVME_CONNECT_READ;
 	}
 
@@ -927,7 +927,7 @@ static int __nvmf_add_ctrl(struct nvme_global_ctx *ctx, const char *argstr)
 	fd = open(nvmf_dev, O_RDWR);
 	if (fd < 0) {
 		nvme_msg(ctx, LOG_ERR, "Failed to open %s: %s\n",
-			 nvmf_dev, strerror(errno));
+			 nvmf_dev, nvme_strerror(errno));
 		return -ENVME_CONNECT_OPEN;
 	}
 
@@ -936,7 +936,7 @@ static int __nvmf_add_ctrl(struct nvme_global_ctx *ctx, const char *argstr)
 	ret = write(fd, argstr, len);
 	if (ret != len) {
 		nvme_msg(ctx, LOG_INFO, "Failed to write to %s: %s\n",
-			 nvmf_dev, strerror(errno));
+			 nvmf_dev, nvme_strerror(errno));
 		switch (errno) {
 		case EALREADY:
 			return -ENVME_CONNECT_ALREADY;
@@ -963,7 +963,7 @@ static int __nvmf_add_ctrl(struct nvme_global_ctx *ctx, const char *argstr)
 	len = read(fd, buf, sizeof(buf) - 1);
 	if (len < 0) {
 		nvme_msg(ctx, LOG_ERR, "Failed to read from %s: %s\n",
-			 nvmf_dev, strerror(errno));
+			 nvmf_dev, nvme_strerror(errno));
 		return -ENVME_CONNECT_READ;
 	}
 	nvme_msg(ctx, LOG_DEBUG, "connect ctrl, response '%.*s'\n",
@@ -1795,7 +1795,7 @@ static int nvmf_dim(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u8 trtype,
 	ret = get_entity_name(dim->ename, sizeof(dim->ename));
 	if (ret <= 0)
 		nvme_msg(ctx, LOG_INFO, "%s: Failed to retrieve ENAME. %s.\n",
-			 c->name, strerror(ret));
+			 c->name, nvme_strerror(ret));
 
 	ret = get_entity_version(dim->ever, sizeof(dim->ever));
 	if (ret <= 0)

libnvme/src/nvme/json.c

@@ -243,7 +243,7 @@ int json_read_config(struct nvme_global_ctx *ctx, const char *config_file)
 	fd = open(config_file, O_RDONLY);
 	if (fd < 0) {
 		nvme_msg(ctx, LOG_DEBUG, "Error opening %s, %s\n",
-			 config_file, strerror(errno));
+			 config_file, nvme_strerror(errno));
 		return fd;
 	}
 	json_root = parse_json(ctx, fd);

libnvme/src/nvme/nbft.c

@@ -750,14 +750,14 @@ int nvme_nbft_read(struct nvme_global_ctx *ctx, struct nbft_info **nbft,
 	raw_nbft_fp = fopen(filename, "rb");
 	if (raw_nbft_fp == NULL) {
 		nvme_msg(ctx, LOG_ERR, "Failed to open %s: %s\n",
-			 filename, strerror(errno));
+			 filename, nvme_strerror(errno));
 		return -EINVAL;
 	}
 
 	i = fseek(raw_nbft_fp, 0L, SEEK_END);
 	if (i) {
 		nvme_msg(ctx, LOG_ERR, "Failed to read from %s: %s\n",
-			 filename, strerror(errno));
+			 filename, nvme_strerror(errno));
 		fclose(raw_nbft_fp);
 		return -EINVAL;
 	}
@@ -776,7 +776,7 @@ int nvme_nbft_read(struct nvme_global_ctx *ctx, struct nbft_info **nbft,
 	i = fread(raw_nbft, sizeof(*raw_nbft), raw_nbft_size, raw_nbft_fp);
 	if (i != raw_nbft_size) {
 		nvme_msg(ctx, LOG_ERR, "Failed to read from %s: %s\n",
-			 filename, strerror(errno));
+			 filename, nvme_strerror(errno));
 		fclose(raw_nbft_fp);
 		free(raw_nbft);
 		return -EINVAL;

libnvme/src/nvme/tree.c

@@ -289,7 +289,7 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
 	ctrls.num = nvme_scan_ctrls(&ctrls.ents);
 	if (ctrls.num < 0) {
 		nvme_msg(ctx, LOG_DEBUG, "failed to scan ctrls: %s\n",
-			 strerror(-ctrls.num));
+			 nvme_strerror(-ctrls.num));
 		return ctrls.num;
 	}
 
@@ -299,15 +299,15 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
 		ret = nvme_scan_ctrl(ctx, ctrls.ents[i]->d_name, &c);
 		if (!ret) {
 			nvme_msg(ctx, LOG_DEBUG, "failed to scan ctrl %s: %s\n",
-				 ctrls.ents[i]->d_name, strerror(ret));
+				 ctrls.ents[i]->d_name, nvme_strerror(ret));
 			continue;
 		}
 	}
 
 	subsys.num = nvme_scan_subsystems(&subsys.ents);
 	if (subsys.num < 0) {
 		nvme_msg(ctx, LOG_DEBUG, "failed to scan subsystems: %s\n",
-			 strerror(-subsys.num));
+			 nvme_strerror(-subsys.num));
 		return subsys.num;
 	}
 
@@ -316,7 +316,7 @@ int nvme_scan_topology(struct nvme_global_ctx *ctx, nvme_scan_filter_t f, void *
 		if (ret < 0) {
 			nvme_msg(ctx, LOG_DEBUG,
 				 "failed to scan subsystem %s: %s\n",
-				 subsys.ents[i]->d_name, strerror(-ret));
+				 subsys.ents[i]->d_name, nvme_strerror(-ret));
 		}
 	}
 
@@ -843,7 +843,7 @@ static int nvme_subsystem_scan_namespaces(struct nvme_global_ctx *ctx, nvme_subs
 	if (namespaces.num < 0) {
 		nvme_msg(ctx, LOG_DEBUG,
 			 "failed to scan namespaces for subsys %s: %s\n",
-			 s->subsysnqn, strerror(-namespaces.num));
+			 s->subsysnqn, nvme_strerror(-namespaces.num));
 		return namespaces.num;
 	}
 
@@ -853,7 +853,7 @@ static int nvme_subsystem_scan_namespaces(struct nvme_global_ctx *ctx, nvme_subs
 		if (ret < 0)
 			nvme_msg(ctx, LOG_DEBUG,
 				 "failed to scan namespace %s: %s\n",
-				 namespaces.ents[i]->d_name, strerror(-ret));
+				 namespaces.ents[i]->d_name, nvme_strerror(-ret));
 	}
 
 	return 0;

logging.c

@@ -103,7 +103,7 @@ static void nvme_log_retry(int errnum)
 	if (log_level < LOG_DEBUG)
 		return;
 
-	printf("passthru command returned '%s'\n", strerror(errnum));
+	printf("passthru command returned '%s'\n", nvme_strerror(errnum));
 }
 
 void *nvme_submit_entry(struct nvme_transport_handle *hdl,

nvme-models.c

@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "nvme-models.h"
+#include "nvme.h"
 
 static char *_fmt1 = "/sys/class/nvme/nvme%d/device/subsystem_vendor";
 static char *_fmt2 = "/sys/class/nvme/nvme%d/device/subsystem_device";
@@ -244,7 +245,7 @@ static int read_sys_node(char *where, char *save, size_t savesz)
 	fd = open(where, O_RDONLY);
 	if (fd < 0) {
 		fprintf(stderr, "Failed to open %s with errno %s\n",
-			where, strerror(errno));
+			where, nvme_strerror(errno));
 		return 1;
 	}
 	/* -1 so we can safely use strstr below */
@@ -327,7 +328,7 @@ char *nvme_product_name(int id)
 
 	line = malloc(1024);
 	if (!line) {
-		fprintf(stderr, "malloc: %s\n", strerror(errno));
+		fprintf(stderr, "malloc: %s\n", nvme_strerror(errno));
 		goto error0;
 	}
 

nvme-print-json.c

@@ -5344,7 +5344,7 @@ static void json_output_perror(const char *msg, va_list ap)
 	if (vasprintf(&error, msg, ap) < 0)
 		error = alloc_error;
 
-	obj_add_key(r, "error", "%s: %s", error, strerror(errno));
+	obj_add_key(r, "error", "%s: %s", error, nvme_strerror(errno));
 
 	json_output_object(r);
 }

nvme-rpmb.c

@@ -168,7 +168,7 @@ static int read_file(const char *file, unsigned char **data, unsigned int *len)
 	if (file == NULL) return err;
 
 	if ((fd = open(file, O_RDONLY)) < 0) {
-		fprintf(stderr, "Failed to open %s: %s\n", file, strerror(errno));
+		fprintf(stderr, "Failed to open %s: %s\n", file, nvme_strerror(errno));
 		return fd;
 	}
 
@@ -189,7 +189,7 @@ static int read_file(const char *file, unsigned char **data, unsigned int *len)
 	if (err < 0) {
 		err = -errno;
 		fprintf(stderr, "Failed to read data from file"
-				" %s with %s\n", file, strerror(errno));
+				" %s with %s\n", file, nvme_strerror(errno));
 		free(buf);
 		goto out;
 	}