virsh: Inline VIRSH_COMMON_OPT_NETWORK_OT_STRING macro

The macro is used in just one place and the definition of the option is
going to be modified. Inline the macro.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-03-14 22:22:08 +01:00
parent d2e29eb74c
commit 1f3f9c81da

View File

@ -43,17 +43,6 @@
#define VIRSH_COMMON_OPT_NETWORK_FULL(cflags) \ #define VIRSH_COMMON_OPT_NETWORK_FULL(cflags) \
VIRSH_COMMON_OPT_NETWORK(N_("network name or uuid"), cflags) VIRSH_COMMON_OPT_NETWORK(N_("network name or uuid"), cflags)
#define VIRSH_COMMON_OPT_NETWORK_OT_STRING(_helpstr, cflags) \
{.name = "network", \
.type = VSH_OT_STRING, \
.help = _helpstr, \
.completer = virshNetworkNameCompleter, \
.completer_flags = cflags, \
}
#define VIRSH_COMMON_OPT_NETWORK_OT_STRING_FULL(cflags) \
VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("network name or uuid"), cflags)
#define VIRSH_COMMON_OPT_NETWORK_PORT(cflags) \ #define VIRSH_COMMON_OPT_NETWORK_PORT(cflags) \
{.name = "port", \ {.name = "port", \
.type = VSH_OT_STRING, \ .type = VSH_OT_STRING, \
@ -1587,7 +1576,11 @@ static const vshCmdInfo info_network_event = {
}; };
static const vshCmdOptDef opts_network_event[] = { static const vshCmdOptDef opts_network_event[] = {
VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("filter by network name or uuid"), 0), {.name = "network",
.type = VSH_OT_STRING,
.help = N_("filter by network name or uuid"),
.completer = virshNetworkNameCompleter,
},
{.name = "event", {.name = "event",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.completer = virshNetworkEventNameCompleter, .completer = virshNetworkEventNameCompleter,