summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-09-23 10:53:06 +0200
committerThomas Haller <thaller@redhat.com>2020-09-23 10:55:17 +0200
commitb8811d97a4744f2896d08a8f3e06907d63813efb (patch)
tree99765c0ec944a0142593efb1c5e95e71ab3151a9
parent41147c4d17c2731c38dc4959c5fc5baa5caf1b14 (diff)
downloadNetworkManager-b8811d97a4744f2896d08a8f3e06907d63813efb.tar.gz
all: require a semicolon after NM_CACHED_QUARK_FCN()
-rw-r--r--clients/cli/nmcli.c2
-rw-r--r--libnm-core/nm-errors.c16
-rw-r--r--libnm/nm-client.c4
-rw-r--r--shared/nm-glib-aux/nm-macros-internal.h2
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.c2
-rw-r--r--src/devices/bluetooth/nm-bt-error.c2
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/ppp/nm-ppp-manager.c2
-rw-r--r--src/settings/nm-settings.c4
-rw-r--r--src/supplicant/nm-supplicant-manager.c2
10 files changed, 19 insertions, 19 deletions
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 9e8f627094..7de17fdc3c 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -116,7 +116,7 @@ typedef struct {
GMainLoop *loop = NULL;
struct termios termios_orig;
-NM_CACHED_QUARK_FCN ("nmcli-error-quark", nmcli_error_quark)
+NM_CACHED_QUARK_FCN ("nmcli-error-quark", nmcli_error_quark);
static void
complete_field_setting (GHashTable *h, NMMetaSettingType setting_type)
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 9aa25ff862..d2c8cbd99f 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -10,14 +10,14 @@
#include "nm-vpn-dbus-interface.h"
#include "nm-core-internal.h"
-NM_CACHED_QUARK_FCN ("nm-agent-manager-error-quark", nm_agent_manager_error_quark)
-NM_CACHED_QUARK_FCN ("nm-connection-error-quark", nm_connection_error_quark)
-NM_CACHED_QUARK_FCN ("nm-crypto-error-quark", nm_crypto_error_quark)
-NM_CACHED_QUARK_FCN ("nm-device-error-quark", nm_device_error_quark)
-NM_CACHED_QUARK_FCN ("nm-manager-error-quark", nm_manager_error_quark)
-NM_CACHED_QUARK_FCN ("nm-secret-agent-error-quark", nm_secret_agent_error_quark)
-NM_CACHED_QUARK_FCN ("nm-settings-error-quark", nm_settings_error_quark)
-NM_CACHED_QUARK_FCN ("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark)
+NM_CACHED_QUARK_FCN ("nm-agent-manager-error-quark", nm_agent_manager_error_quark);
+NM_CACHED_QUARK_FCN ("nm-connection-error-quark", nm_connection_error_quark);
+NM_CACHED_QUARK_FCN ("nm-crypto-error-quark", nm_crypto_error_quark);
+NM_CACHED_QUARK_FCN ("nm-device-error-quark", nm_device_error_quark);
+NM_CACHED_QUARK_FCN ("nm-manager-error-quark", nm_manager_error_quark);
+NM_CACHED_QUARK_FCN ("nm-secret-agent-error-quark", nm_secret_agent_error_quark);
+NM_CACHED_QUARK_FCN ("nm-settings-error-quark", nm_settings_error_quark);
+NM_CACHED_QUARK_FCN ("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark);
static void
register_error_domain (GQuark domain,
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 0fb37584cb..77e5ed280e 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -60,7 +60,7 @@
/*****************************************************************************/
-NM_CACHED_QUARK_FCN ("nm-context-busy-watcher", nm_context_busy_watcher_quark)
+NM_CACHED_QUARK_FCN ("nm-context-busy-watcher", nm_context_busy_watcher_quark);
static void
_context_busy_watcher_attach_integration_source_cb (gpointer data,
@@ -403,7 +403,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nml_dbus_obj_state_to_string, NMLDBusObjState,
*
* Returns: the error quark used for #NMClient errors.
**/
-NM_CACHED_QUARK_FCN ("nm-client-error-quark", nm_client_error_quark)
+NM_CACHED_QUARK_FCN ("nm-client-error-quark", nm_client_error_quark);
/*****************************************************************************/
diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 60cf52c384..7d393ba39b 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -534,7 +534,7 @@ GQuark \
fcn (void) \
{ \
return NM_CACHED_QUARK (string); \
-}
+} struct _dummy_struct_for_trailing_semicolon
/*****************************************************************************/
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 80b754f989..3f1a618125 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -2292,7 +2292,7 @@ _nm_utils_ascii_str_to_bool (const char *str,
/*****************************************************************************/
-NM_CACHED_QUARK_FCN ("nm-utils-error-quark", nm_utils_error_quark)
+NM_CACHED_QUARK_FCN ("nm-utils-error-quark", nm_utils_error_quark);
void
nm_utils_error_set_cancelled (GError **error,
diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c
index 8aa4283d16..619b50f671 100644
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/devices/bluetooth/nm-bt-error.c
@@ -7,5 +7,5 @@
#include "nm-bt-error.h"
-NM_CACHED_QUARK_FCN ("nm-bt-error", nm_bt_error_quark)
+NM_CACHED_QUARK_FCN ("nm-bt-error", nm_bt_error_quark);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 9441fa01c7..3b78e3fea2 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -384,7 +384,7 @@ static void _activation_auth_done (NMManager *self,
/*****************************************************************************/
static
-NM_CACHED_QUARK_FCN ("autoconnect-root", autoconnect_root_quark)
+NM_CACHED_QUARK_FCN ("autoconnect-root", autoconnect_root_quark);
/*****************************************************************************/
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index 751ec28b94..a0887b8d8c 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -42,7 +42,7 @@
#define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so"
static
-NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark)
+NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark);
/*****************************************************************************/
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index c86bf6c07e..8d1f237a75 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -69,10 +69,10 @@
/*****************************************************************************/
static
-NM_CACHED_QUARK_FCN ("default-wired-connection", _default_wired_connection_quark)
+NM_CACHED_QUARK_FCN ("default-wired-connection", _default_wired_connection_quark);
static
-NM_CACHED_QUARK_FCN ("default-wired-connection-blocked", _default_wired_connection_blocked_quark)
+NM_CACHED_QUARK_FCN ("default-wired-connection-blocked", _default_wired_connection_blocked_quark);
/*****************************************************************************/
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c
index b736079875..7f9aa7a8ef 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/supplicant/nm-supplicant-manager.c
@@ -90,7 +90,7 @@ NM_DEFINE_SINGLETON_GETTER (NMSupplicantManager, nm_supplicant_manager_get, NM_T
/*****************************************************************************/
-NM_CACHED_QUARK_FCN ("nm-supplicant-error-quark", nm_supplicant_error_quark)
+NM_CACHED_QUARK_FCN ("nm-supplicant-error-quark", nm_supplicant_error_quark);
/*****************************************************************************/