diff options
author | Thomas Haller <thaller@redhat.com> | 2020-07-19 11:40:50 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-07-19 12:12:58 +0200 |
commit | ba42189bb90b98e3ceae7b77cb1639bd7e2e72c7 (patch) | |
tree | 8e490fdb335fdf0cc22ce45f79b28faf6fedb5b2 | |
parent | b17e3cf707428061b36cd3462370072b14afe4dc (diff) | |
download | NetworkManager-ba42189bb90b98e3ceae7b77cb1639bd7e2e72c7.tar.gz |
all: add trailing semicolon to NM_UTILS_LOOKUP_DEFINE()/NM_GOBJECT_PROPERTIES_DEFINE*()
-rw-r--r-- | clients/cli/connections.c | 4 | ||||
-rw-r--r-- | clients/common/nm-client-utils.c | 10 | ||||
-rw-r--r-- | shared/nm-glib-aux/nm-macros-internal.h | 3 | ||||
-rw-r--r-- | src/nm-core-utils.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d80c78d7d7..b8b995f901 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -70,7 +70,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (active_connection_state_to_string, NMActiveConnectio NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, N_("deactivating")), NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_DEACTIVATED, N_("deactivated")), NM_UTILS_LOOKUP_ITEM_IGNORE (NM_ACTIVE_CONNECTION_STATE_UNKNOWN), -) +); static NM_UTILS_LOOKUP_STR_DEFINE (vpn_connection_state_to_string, NMVpnConnectionState, @@ -83,7 +83,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (vpn_connection_state_to_string, NMVpnConnectionState NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_FAILED, N_("VPN connection failed")), NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_DISCONNECTED, N_("VPN disconnected")), NM_UTILS_LOOKUP_ITEM_IGNORE (NM_VPN_CONNECTION_STATE_UNKNOWN), -) +); /*****************************************************************************/ diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index a063fd596d..daaa565350 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -263,7 +263,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_state_to_string, NMDeviceState, NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_DEACTIVATING, N_("deactivating")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_FAILED, N_("connection failed")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_UNKNOWN, N_("unknown")), -) +); static NM_UTILS_LOOKUP_STR_DEFINE (_device_state_to_string, NMDeviceState, @@ -278,7 +278,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (_device_state_to_string, NMDeviceState, NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_DEACTIVATING, N_("deactivating (externally)")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_FAILED, N_("deactivating (externally)")), NM_UTILS_LOOKUP_ITEM_IGNORE_OTHER (), -) +); const char * nmc_device_state_to_string_with_external (NMDevice *device) @@ -304,7 +304,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_metered_to_string, NMMetered, NM_UTILS_LOOKUP_ITEM (NM_METERED_GUESS_YES, N_("yes (guessed)")), NM_UTILS_LOOKUP_ITEM (NM_METERED_GUESS_NO, N_("no (guessed)")), NM_UTILS_LOOKUP_ITEM (NM_METERED_UNKNOWN, N_("unknown")), -) +); NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason, /* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */ @@ -377,7 +377,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason, NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED, N_("The selected IP method is not supported")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED, N_("Failed to configure SR-IOV parameters")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PEER_NOT_FOUND, N_("The Wi-Fi P2P peer could not be found")), -) +); NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiveConnectionStateReason, /* TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason) */ @@ -397,7 +397,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiv NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED, N_("Master connection failed")), NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED, N_("Could not create a software link")), NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED, N_("The device disappeared")), -) +); NMActiveConnectionState nmc_activation_get_effective_state (NMActiveConnection *active, diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h index a004807d4a..9173d2792d 100644 --- a/shared/nm-glib-aux/nm-macros-internal.h +++ b/shared/nm-glib-aux/nm-macros-internal.h @@ -725,6 +725,7 @@ _notify##suffix (obj_type *obj, _PropertyEnums##suffix prop) \ { \ _nm_gobject_notify_together_impl##suffix (obj, 1, &prop); \ } \ +_NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON #define NM_GOBJECT_PROPERTIES_DEFINE_BASE(...) \ NM_GOBJECT_PROPERTIES_DEFINE_BASE_FULL (, __VA_ARGS__); \ @@ -1018,7 +1019,7 @@ fcn_name (lookup_type val) \ (void) 0; \ }; \ { unknown_val; } \ -} +} _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON #define NM_UTILS_LOOKUP_STR_DEFINE(fcn_name, lookup_type, unknown_val, ...) \ NM_UTILS_LOOKUP_DEFINE (fcn_name, lookup_type, const char *, unknown_val, __VA_ARGS__) diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 66245ec0d6..d186405672 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -4599,4 +4599,4 @@ NM_UTILS_LOOKUP_STR_DEFINE (nm_activation_type_to_string, NMActivationType, NM_UTILS_LOOKUP_STR_ITEM (NM_ACTIVATION_TYPE_MANAGED, "managed"), NM_UTILS_LOOKUP_STR_ITEM (NM_ACTIVATION_TYPE_ASSUME, "assume"), NM_UTILS_LOOKUP_STR_ITEM (NM_ACTIVATION_TYPE_EXTERNAL, "external"), -) +); |