libnvme/fabrics, json: replace fprintf to nvme_msg and dprintf

Since the struct nvme_global_ctx is available.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

libnvme/src/nvme/fabrics.c

@@ -2765,25 +2765,26 @@ void nvmf_nbft_free(struct nvme_global_ctx *ctx, struct nbft_file_entry *head)
 	}
 }
 
-static bool validate_uri(struct nbft_info_discovery *dd,
+static bool validate_uri(struct nvme_global_ctx *ctx,
+			 struct nbft_info_discovery *dd,
 			 struct nvme_fabrics_uri *uri)
 {
 	if (!uri) {
-		fprintf(stderr,
-			"Discovery Descriptor %d: failed to parse URI %s\n",
-			dd->index, dd->uri);
+		nvme_msg(ctx, LOG_ERR,
+			 "Discovery Descriptor %d: failed to parse URI %s\n",
+			 dd->index, dd->uri);
 		return false;
 	}
 	if (strcmp(uri->scheme, "nvme") != 0) {
-		fprintf(stderr,
-			"Discovery Descriptor %d: unsupported scheme '%s'\n",
-			dd->index, uri->scheme);
+		nvme_msg(ctx, LOG_ERR,
+			 "Discovery Descriptor %d: unsupported scheme '%s'\n",
+			 dd->index, uri->scheme);
 		return false;
 	}
 	if (!uri->protocol || strcmp(uri->protocol, "tcp") != 0) {
-		fprintf(stderr,
-			"Discovery Descriptor %d: unsupported transport '%s'\n",
-			dd->index, uri->protocol);
+		nvme_msg(ctx, LOG_ERR,
+			 "Discovery Descriptor %d: unsupported transport '%s'\n",
+			 dd->index, uri->protocol);
 		return false;
 	}
 
@@ -3110,7 +3111,7 @@ int nvmf_discovery_nbft(struct nvme_global_ctx *ctx,
 			ret = nvme_parse_uri((*dd)->uri, &uri);
 			if (ret)
 				continue;
-			if (!validate_uri(*dd, uri))
+			if (!validate_uri(ctx, *dd, uri))
 				continue;
 
 			host_traddr = NULL;

libnvme/src/nvme/json.c

@@ -436,11 +436,12 @@ int json_update_config(struct nvme_global_ctx *ctx, const char *config_file)
 		ret = json_object_to_fd(1, json_root,
 					JSON_C_TO_STRING_PRETTY |
 					JSON_C_TO_STRING_NOSLASHESCAPE);
-		printf("\n");
-	} else
+		dprintf(ctx->log.fd, "\n");
+	} else {
 		ret = json_object_to_file_ext(config_file, json_root,
 					      JSON_C_TO_STRING_PRETTY |
 					      JSON_C_TO_STRING_NOSLASHESCAPE);
+	}
 	if (ret < 0) {
 		nvme_msg(ctx, LOG_ERR, "Failed to write to %s, %s\n",
 			 config_file ? "stdout" : config_file,