Skip to content

Commit e1ce079

Browse files
ikegami-tigaw
authored andcommitted
nvme: add flags type nvme_print_flags_t
Change the flags type to the type from enum nvme_print_flags. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
1 parent 262c675 commit e1ce079

23 files changed

+241
-239
lines changed

fabrics.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ static void save_discovery_log(char *raw, struct nvmf_discovery_log *log)
261261

262262
static int __discover(nvme_ctrl_t c, struct nvme_fabrics_config *defcfg,
263263
char *raw, bool connect, bool persistent,
264-
enum nvme_print_flags flags)
264+
nvme_print_flags_t flags)
265265
{
266266
struct nvmf_discovery_log *log = NULL;
267267
nvme_subsystem_t s = nvme_ctrl_get_subsystem(c);
@@ -407,7 +407,7 @@ static int discover_from_conf_file(nvme_root_t r, nvme_host_t h,
407407
int argc, ret = 0;
408408
unsigned int verbose = 0;
409409
FILE *f;
410-
enum nvme_print_flags flags;
410+
nvme_print_flags_t flags;
411411
char *format = "normal";
412412
struct nvme_fabrics_config cfg;
413413
bool force = false;
@@ -505,7 +505,7 @@ static int discover_from_conf_file(nvme_root_t r, nvme_host_t h,
505505
static int discover_from_json_config_file(nvme_root_t r, nvme_host_t h,
506506
const char *desc, bool connect,
507507
const struct nvme_fabrics_config *defcfg,
508-
enum nvme_print_flags flags,
508+
nvme_print_flags_t flags,
509509
bool force)
510510
{
511511
const char *transport, *traddr, *host_traddr, *host_iface, *trsvcid, *subsysnqn;
@@ -693,7 +693,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
693693
char *config_file = PATH_NVMF_CONFIG;
694694
char *hnqn = NULL, *hid = NULL;
695695
char *context = NULL;
696-
enum nvme_print_flags flags;
696+
nvme_print_flags_t flags;
697697
nvme_root_t r;
698698
nvme_host_t h;
699699
nvme_ctrl_t c = NULL;
@@ -917,7 +917,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
917917
nvme_host_t h;
918918
nvme_ctrl_t c;
919919
int ret;
920-
enum nvme_print_flags flags;
920+
nvme_print_flags_t flags;
921921
struct nvme_fabrics_config cfg = { 0 };
922922
char *format = "normal";
923923
char *hostnqn_arg, *hostid_arg;

nbft.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static int do_connect(nvme_root_t r,
110110
struct nbft_info_subsystem_ns *ss,
111111
struct tr_config *trcfg,
112112
struct nvme_fabrics_config *cfg,
113-
enum nvme_print_flags flags,
113+
nvme_print_flags_t flags,
114114
unsigned int verbose)
115115
{
116116
nvme_ctrl_t c;
@@ -184,7 +184,7 @@ static int do_discover(struct nbft_info_discovery *dd,
184184
nvme_ctrl_t c,
185185
struct nvme_fabrics_config *defcfg,
186186
struct tr_config *deftrcfg,
187-
enum nvme_print_flags flags,
187+
nvme_print_flags_t flags,
188188
unsigned int verbose)
189189
{
190190
struct nvmf_discovery_log *log = NULL;
@@ -286,7 +286,7 @@ int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg,
286286
char *hostnqn_sys, char *hostid_sys,
287287
const char *desc, bool connect,
288288
struct nvme_fabrics_config *cfg, char *nbft_path,
289-
enum nvme_print_flags flags, unsigned int verbose)
289+
nvme_print_flags_t flags, unsigned int verbose)
290290
{
291291
char *hostnqn = NULL, *hostid = NULL, *host_traddr = NULL;
292292
nvme_host_t h;

nbft.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ extern int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg
1616
char *hostnqn_sys, char *hostid_sys,
1717
const char *desc, bool connect,
1818
struct nvme_fabrics_config *cfg, char *nbft_path,
19-
enum nvme_print_flags flags, unsigned int verbose);
19+
nvme_print_flags_t flags, unsigned int verbose);

nvme-print-binary.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static struct print_ops binary_print_ops = {
379379
.show_error_status = NULL,
380380
};
381381

382-
struct print_ops *nvme_get_binary_print_ops(enum nvme_print_flags flags)
382+
struct print_ops *nvme_get_binary_print_ops(nvme_print_flags_t flags)
383383
{
384384
binary_print_ops.flags = flags;
385385
return &binary_print_ops;

nvme-print-json.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4739,7 +4739,7 @@ static struct print_ops json_print_ops = {
47394739
.show_error_status = json_output_error_status,
47404740
};
47414741

4742-
struct print_ops *nvme_get_json_print_ops(enum nvme_print_flags flags)
4742+
struct print_ops *nvme_get_json_print_ops(nvme_print_flags_t flags)
47434743
{
47444744
json_print_ops.flags = flags;
47454745
return &json_print_ops;

nvme-print-stdout.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5216,7 +5216,7 @@ static struct print_ops stdout_print_ops = {
52165216
.show_error_status = stdout_error_status,
52175217
};
52185218

5219-
struct print_ops *nvme_get_stdout_print_ops(enum nvme_print_flags flags)
5219+
struct print_ops *nvme_get_stdout_print_ops(nvme_print_flags_t flags)
52205220
{
52215221
stdout_print_ops.flags = flags;
52225222
return &stdout_print_ops;

0 commit comments

Comments
 (0)