]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
fabrics: use "const char *" in struct config
authorMartin Wilck <mwilck@suse.com>
Sun, 17 Jan 2021 21:37:03 +0000 (22:37 +0100)
committerMartin Wilck <mwilck@suse.com>
Tue, 30 Mar 2021 15:46:22 +0000 (17:46 +0200)
This is easily done, and allows passing in some const char* pointers
that would otherwise need to be strdup()d first.

Do not use const char * for cfg->device, because we may need to free()
it.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
fabrics.c

index 4a5c2f9c038a92d0bc9553cb176c0d74672255da..9a694bd17d4dbf6c74058b0a05b6c513d99887e9 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -67,13 +67,13 @@ const char *conarg_trsvcid = "trsvcid";
 const char *conarg_host_traddr = "host_traddr";
 
 static struct config {
-       char *nqn;
-       char *transport;
-       char *traddr;
-       char *trsvcid;
-       char *host_traddr;
-       char *hostnqn;
-       char *hostid;
+       const char *nqn;
+       const char *transport;
+       const char *traddr;
+       const char *trsvcid;
+       const char *host_traddr;
+       const char *hostnqn;
+       const char *hostid;
        int  nr_io_queues;
        int  nr_write_queues;
        int  nr_poll_queues;
@@ -82,7 +82,7 @@ static struct config {
        int  reconnect_delay;
        int  ctrl_loss_tmo;
        int  tos;
-       char *raw;
+       const char *raw;
        char *device;
        int  duplicate_connect;
        int  disable_sqflow;
@@ -90,7 +90,7 @@ static struct config {
        int  data_digest;
        bool persistent;
        bool matching_only;
-       char *output_format;
+       const char *output_format;
 } cfg = {
        .ctrl_loss_tmo = NVMF_DEF_CTRL_LOSS_TMO,
        .output_format = "normal",