diff options
39 files changed, 191 insertions, 191 deletions
diff --git a/Makefile.am b/Makefile.am index 1b79031248..85a64d2cc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -623,7 +623,7 @@ endif EXTRA_DIST += \ libnm-core/crypto_gnutls.c \ - libnm-core/crypto_nss.c \ + libnm-core/crypto_nss.c \ libnm-core/nm-core-enum-types.c.template \ libnm-core/nm-core-enum-types.h.template \ libnm-core/meson.build @@ -712,11 +712,11 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu # test-cert.p12 created with: # # openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 EXTRA_DIST += \ libnm-core/tests/certs/ca-no-ending-newline.pem \ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d41c9504d8..519780a346 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -6776,7 +6776,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote) return confirmed; } -typedef struct { +typedef struct { guint level; char *main_prompt; NMSetting *curr_setting; diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index 213e198b64..112d259966 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -376,5 +376,5 @@ nmt_newt_edit_string (const char *data) g_free (filename); return new_data; -} +} diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c index 5602c062d3..b33aa869af 100644 --- a/clients/tui/newt/nmt-newt-widget.c +++ b/clients/tui/newt/nmt-newt-widget.c @@ -311,7 +311,7 @@ nmt_newt_widget_real_activated (NmtNewtWidget *widget) if (priv->exit_on_activate) nmt_newt_form_quit (nmt_newt_widget_get_form (widget)); -} +} /** * nmt_newt_widget_activated: diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index e90140b3c0..c1756da05e 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -502,7 +502,7 @@ nmt_edit_connection_list_class_init (NmtEditConnectionListClass *list_class) G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - + /** * NmtEditConnectionListFilter: * @list: the #NmtEditConnectionList diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index e39a4c96a6..1629c8b083 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -203,21 +203,21 @@ slaves_changed (GObject *object, nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->mode), TRUE); } -#define WIDGET_CHANGED_FUNC(widget, func, option) \ -static void \ -widget ## _widget_changed (GObject *object, \ - GParamSpec *pspec, \ - gpointer user_data) \ -{ \ - NmtPageBond *bond = NMT_PAGE_BOND (user_data); \ - NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \ - \ - if (priv->updating) \ - return; \ - \ - priv->updating = TRUE; \ - nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \ - priv->updating = FALSE; \ +#define WIDGET_CHANGED_FUNC(widget, func, option) \ +static void \ +widget ## _widget_changed (GObject *object, \ + GParamSpec *pspec, \ + gpointer user_data) \ +{ \ + NmtPageBond *bond = NMT_PAGE_BOND (user_data); \ + NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \ + \ + if (priv->updating) \ + return; \ + \ + priv->updating = TRUE; \ + nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \ + priv->updating = FALSE; \ } WIDGET_CHANGED_FUNC (primary, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_PRIMARY) diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index af2221adf6..0d40373d4c 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -68,7 +68,7 @@ edit_clicked (NmtNewtButton *button, NM_SETTING_TEAM_PORT_CONFIG, new_config, NULL); g_free (new_config); -} +} static void nmt_page_team_port_constructed (GObject *object) diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index 2523bd85d9..cfe127035f 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -121,7 +121,7 @@ edit_clicked (NmtNewtButton *button, NM_SETTING_TEAM_CONFIG, new_config, NULL); g_free (new_config); -} +} static void nmt_page_team_constructed (GObject *object) diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index eea81e9985..109759cc27 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -152,7 +152,7 @@ static newtComponent nmt_route_entry_get_focus_component (NmtNewtWidget *widget) { NmtRouteEntryPrivate *priv = NMT_ROUTE_ENTRY_GET_PRIVATE (widget); - + return nmt_newt_widget_get_focus_component (priv->dest); } diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 6d1d27e8e2..efab0a5384 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -604,7 +604,7 @@ find_scripts (const char *str_action) while ((filename = g_dir_read_name (dir))) { char *path; - struct stat st; + struct stat st; int err; const char *err_msg = NULL; diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 8a868d0e9c..dab2e3f7f7 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -49,18 +49,18 @@ extra_files = libnm-glib.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/shared \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/shared \ -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_srcdir)/libnm-glib \ - -I$(top_builddir)/libnm-glib \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -I$(top_builddir)/libnm-glib \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) -GTKDOC_LIBS = \ +GTKDOC_LIBS = \ $(top_builddir)/libnm-glib/libnm-glib.la \ $(GLIB_LIBS) diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 1d417894b2..5b8d7260ab 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -37,7 +37,7 @@ IGNORE_HFILES= \ nm-version.h # Images to copy into HTML directory. -HTML_IMAGES = +HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). content_files = version.xml @@ -48,10 +48,10 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 288a595e64..89784967fa 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -66,15 +66,15 @@ extra_files = libnm.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) -GTKDOC_LIBS = \ +GTKDOC_LIBS = \ $(top_builddir)/libnm/libnm.la \ $(GLIB_LIBS) diff --git a/examples/python/dbus/wifi-hotspot.py b/examples/python/dbus/wifi-hotspot.py index dd33b4459f..9b057a2c9e 100755 --- a/examples/python/dbus/wifi-hotspot.py +++ b/examples/python/dbus/wifi-hotspot.py @@ -54,7 +54,7 @@ con = dbus.Dictionary({ 'ipv6': s_ip6 }) -def usage(): +def usage(): print("Usage: %s <ifname> [up|down]" % sys.argv[0]) sys.exit(0) diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py index 32d3b14332..b92a7b090a 100755 --- a/examples/python/gi/device-state-ip4config.py +++ b/examples/python/gi/device-state-ip4config.py @@ -27,13 +27,13 @@ from gi.repository import GLib, NM # # This example shows how to get NMIP4Config from NMDevice after it is activated. -# +# # We listen to notify::ip4-config glib signal. This signal is trigered by D-Bus # PropertiesChanged for IP4Config that comes after StateChanged for NMDevice. # main_loop = None - + def do_notify(self, property): print("notify: %s" % property) ip4cfg = self.get_ip4_config() diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 1773841dac..bdbff9b7ec 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -2455,7 +2455,7 @@ nm_connection_get_setting_ovs_patch (NMConnection *connection) { return _connection_get_setting_check (connection, NM_TYPE_SETTING_OVS_PATCH); } - + /** * nm_connection_get_setting_ovs_port: * @connection: the #NMConnection diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 65e2634772..b02e727fc3 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -59,7 +59,7 @@ static const char* _link_watcher_name[] = { struct NMTeamLinkWatcher { guint refcount; - guint8 type; /* LinkWatcherTypes */ + guint8 type; /* LinkWatcherTypes */ /* * The union is constructed in order to allow mapping the options of all the diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h index e93d8fbddd..17bd08274d 100644 --- a/libnm-core/nm-vpn-editor-plugin.h +++ b/libnm-core/nm-vpn-editor-plugin.h @@ -179,4 +179,4 @@ void nm_vpn_editor_plugin_set_plugin_info (NMVpnEditorPlugin *plugin G_END_DECLS -#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */ +#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */ diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 5f15a51062..c4723c954d 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -47,12 +47,12 @@ test_wireless_enabled (NMClient *client) wireless = nm_client_wireless_get_enabled (client); g_print ("Wireless enabled? %s\n", wireless ? "yes" : "no"); -// nm_client_wireless_set_enabled (client, !wireless); +// nm_client_wireless_set_enabled (client, !wireless); wireless = nm_client_wireless_hardware_get_enabled (client); g_print ("Wireless HW enabled? %s\n", wireless ? "yes" : "no"); -// nm_client_wireless_set_enabled (client, !wireless); +// nm_client_wireless_set_enabled (client, !wireless); return TRUE; } diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 2c0b9657c8..59097995ba 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -32,37 +32,37 @@ #include "NetworkManager.h" #include "libnm_glib.h" -#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist" +#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist" struct libnm_glib_ctx { - unsigned char check; + unsigned char check; - GMainContext * g_main_ctx; - GMainLoop * g_main_loop; - DBusConnection * dbus_con; - guint dbus_watcher; - guint dbus_watch_interval; + GMainContext * g_main_ctx; + GMainLoop * g_main_loop; + DBusConnection * dbus_con; + guint dbus_watcher; + guint dbus_watch_interval; - gboolean thread_done; - gboolean thread_inited; - GThread * thread; + gboolean thread_done; + gboolean thread_inited; + GThread * thread; - GSList * callbacks; - GMutex * callbacks_lock; - guint callback_id_last; + GSList * callbacks; + GMutex * callbacks_lock; + guint callback_id_last; - libnm_glib_state nm_state; + libnm_glib_state nm_state; }; typedef struct libnm_glib_callback { - guint id; - GMainContext * gmain_ctx; - libnm_glib_ctx * libnm_glib_ctx; - libnm_glib_callback_func func; - gpointer user_data; + guint id; + GMainContext * gmain_ctx; + libnm_glib_ctx * libnm_glib_ctx; + libnm_glib_callback_func func; + gpointer user_data; } libnm_glib_callback; @@ -74,9 +74,9 @@ static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state); static void _libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data) { - DBusMessage * reply; - libnm_glib_ctx * ctx = (libnm_glib_ctx *) user_data; - NMState nm_state; + DBusMessage *reply; + libnm_glib_ctx *ctx = (libnm_glib_ctx *) user_data; + NMState nm_state; g_return_if_fail (pcall != NULL); g_return_if_fail (ctx != NULL); @@ -108,8 +108,8 @@ out: static void _libnm_glib_get_nm_state (libnm_glib_ctx *ctx) { - DBusMessage * message; - DBusPendingCall * pcall = NULL; + DBusMessage *message; + DBusPendingCall *pcall = NULL; g_return_if_fail (ctx != NULL); @@ -125,7 +125,7 @@ _libnm_glib_get_nm_state (libnm_glib_ctx *ctx) static gboolean _libnm_glib_callback_helper (gpointer user_data) { - libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data; + libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data; g_return_val_if_fail (cb_data != NULL, FALSE); g_return_val_if_fail (cb_data->func != NULL, FALSE); @@ -140,7 +140,7 @@ static void _libnm_glib_schedule_single_callback (libnm_glib_ctx *ctx, libnm_glib_callback *callback) { - GSource *source; + GSource *source; g_return_if_fail (ctx != NULL); g_return_if_fail (callback != NULL); @@ -170,7 +170,7 @@ _libnm_glib_unschedule_single_callback (libnm_glib_ctx *ctx, static void _libnm_glib_call_callbacks (libnm_glib_ctx *ctx) { - GSList *elem; + GSList *elem; g_return_if_fail (ctx != NULL); @@ -188,7 +188,7 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx) static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state) { - libnm_glib_state old_state; + libnm_glib_state old_state; g_return_if_fail (ctx != NULL); @@ -221,9 +221,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data) { - libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; - gboolean handled = TRUE; - DBusError error; + libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; + gboolean handled = TRUE; + DBusError error; g_return_val_if_fail (ctx != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); g_return_val_if_fail (connection != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); @@ -242,9 +242,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection, else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { /* New signal for dbus 0.23... */ - char *service; - char *old_owner; - char *new_owner; + char *service; + char *old_owner; + char *new_owner; if ( dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &service, @@ -257,9 +257,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection, gboolean old_owner_good = (old_owner && (strlen (old_owner) > 0)); gboolean new_owner_good = (new_owner && (strlen (new_owner) > 0)); - if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */ + if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */ _libnm_glib_get_nm_state (ctx); - else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */ + else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */ ctx->nm_state = LIBNM_NO_NETWORKMANAGER; } } @@ -273,7 +273,7 @@ _libnm_glib_dbus_filter (DBusConnection *connection, } else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged")) { - NMState state = NM_STATE_UNKNOWN; + NMState state = NM_STATE_UNKNOWN; dbus_message_get_args (message, &error, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID); _libnm_glib_update_state (ctx, state); @@ -297,8 +297,8 @@ _libnm_glib_dbus_filter (DBusConnection *connection, static DBusConnection * _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context) { - DBusConnection *connection = NULL; - DBusError error; + DBusConnection *connection = NULL; + DBusError error; dbus_error_init (&error); connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error); @@ -349,7 +349,7 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context) static gboolean _libnm_glib_dbus_watcher (gpointer user_data) { - libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; + libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; g_return_val_if_fail (ctx != NULL, FALSE); @@ -393,7 +393,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx) if (ctx->dbus_watcher == 0) { - GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); + GSource *source = g_timeout_source_new (ctx->dbus_watch_interval); g_source_set_callback (source, _libnm_glib_dbus_watcher, (gpointer) ctx, NULL); ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); g_source_unref (source); @@ -410,7 +410,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx) static gpointer _libnm_glib_dbus_worker (gpointer user_data) { - libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; + libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data; g_return_val_if_fail (ctx != NULL, NULL); @@ -493,7 +493,7 @@ error: libnm_glib_ctx * libnm_glib_init (void) { - libnm_glib_ctx *ctx = NULL; + libnm_glib_ctx *ctx = NULL; if (!g_thread_supported ()) g_thread_init (NULL); @@ -504,7 +504,7 @@ libnm_glib_init (void) ctx->thread = g_thread_create (_libnm_glib_dbus_worker, ctx, TRUE, NULL); if (!ctx->thread) - goto error; + goto error; /* Wait until initialization of the thread */ while (!ctx->thread_inited) @@ -542,12 +542,12 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx) guint -libnm_glib_register_callback (libnm_glib_ctx *ctx, - libnm_glib_callback_func func, - gpointer user_data, - GMainContext *g_main_ctx) +libnm_glib_register_callback (libnm_glib_ctx *ctx, + libnm_glib_callback_func func, + gpointer user_data, + GMainContext *g_main_ctx) { - libnm_glib_callback *callback = NULL; + libnm_glib_callback *callback = NULL; g_return_val_if_fail (ctx != NULL, 0); g_return_val_if_fail (func != NULL, 0); diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 70b98f6dee..3b923aa28d 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -664,7 +664,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - + /** * NMAccessPoint:mode: * diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index fee6fc9f28..f06e77c42e 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -78,13 +78,13 @@ nm_vpn_plugin_ui_interface_get_type (void) if (!vpn_plugin_ui_interface_type) { const GTypeInfo vpn_plugin_ui_interface_info = { sizeof (NMVpnPluginUiInterface), /* class_size */ - interface_init, /* base_init */ - NULL, /* base_finalize */ + interface_init, /* base_init */ + NULL, /* base_finalize */ NULL, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ 0, - 0, /* n_preallocs */ + 0, /* n_preallocs */ NULL }; @@ -197,13 +197,13 @@ nm_vpn_plugin_ui_widget_interface_get_type (void) if (!vpn_plugin_ui_widget_interface_type) { const GTypeInfo vpn_plugin_ui_widget_interface_info = { sizeof (NMVpnPluginUiWidgetInterface), /* class_size */ - widget_interface_init, /* base_init */ - NULL, /* base_finalize */ + widget_interface_init, /* base_init */ + NULL, /* base_finalize */ NULL, - NULL, /* class_finalize */ - NULL, /* class_data */ + NULL, /* class_finalize */ + NULL, /* class_data */ 0, - 0, /* n_preallocs */ + 0, /* n_preallocs */ NULL }; diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index b5ea2a7ef2..bc5d843605 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -272,4 +272,4 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte G_END_DECLS -#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */ +#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */ diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 85ba0f5e4f..4296d5112d 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -947,7 +947,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); - + /** * NMSettingWired:mac-address-blacklist: * diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index fba87c5a79..7f927d2451 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -55,7 +55,7 @@ struct EncodingTriplet struct IsoLangToEncodings { - const char * lang; + const char *lang; struct EncodingTriplet encodings; }; @@ -63,13 +63,13 @@ struct IsoLangToEncodings static const struct IsoLangToEncodings isoLangEntries5[] = { /* Simplified Chinese */ - { "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */ - { "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */ + { "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */ + { "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */ /* Traditional Chinese */ - { "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */ - { "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */ - { "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */ + { "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */ + { "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */ + { "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */ /* Table end */ { NULL, {NULL, NULL, NULL} } @@ -79,49 +79,49 @@ static const struct IsoLangToEncodings isoLangEntries5[] = static const struct IsoLangToEncodings isoLangEntries2[] = { /* Japanese */ - { "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} }, + { "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} }, /* Korean */ - { "ko", {"euc-kr", "iso-2022-kr", "johab"} }, + { "ko", {"euc-kr", "iso-2022-kr", "johab"} }, /* Thai */ - { "th", {"iso-8859-11","windows-874", NULL} }, + { "th", {"iso-8859-11","windows-874", NULL} }, /* Central European */ - { "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */ - { "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */ - { "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */ - { "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */ - { "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */ - { "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */ - { "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */ - { "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */ + { "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */ + { "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */ + { "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */ + { "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */ + { "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */ + { "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */ + { "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */ + { "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */ /* Cyrillic */ - { "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */ - { "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */ - { "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */ - { "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */ - { "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */ - { "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */ + { "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */ + { "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */ + { "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */ + { "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */ + { "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */ + { "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */ /* Arabic */ - { "ar", {"iso-8859-6", "windows-1256", NULL} }, + { "ar", {"iso-8859-6", "windows-1256", NULL} }, /* Baltic */ - { "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */ - { "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */ - { "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */ + { "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */ + { "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */ + { "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */ /* Greek */ - { "el", {"iso-8859-7", "windows-1253", NULL} }, + { "el", {"iso-8859-7", "windows-1253", NULL} }, /* Hebrew */ - { "he", {"iso-8859-8", "windows-1255", NULL} }, - { "iw", {"iso-8859-8", "windows-1255", NULL} }, + { "he", {"iso-8859-8", "windows-1255", NULL} }, + { "iw", {"iso-8859-8", "windows-1255", NULL} }, /* Turkish */ - { "tr", {"iso-8859-9", "windows-1254", NULL} }, + { "tr", {"iso-8859-9", "windows-1254", NULL} }, /* Table end */ { NULL, {NULL, NULL, NULL} } @@ -166,9 +166,9 @@ get_encodings_for_lang (const char *lang, char **encoding2, char **encoding3) { - struct EncodingTriplet * encodings; - gboolean success = FALSE; - char * tmp_lang; + struct EncodingTriplet *encodings; + gboolean success = FALSE; + char *tmp_lang; g_return_val_if_fail (lang != NULL, FALSE); g_return_val_if_fail (encoding1 != NULL, FALSE); diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index ed0135ba88..2e6244c6d1 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -588,7 +588,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - + /** * NMAccessPoint:mode: * diff --git a/libnm/nm-vpn-editor.h b/libnm/nm-vpn-editor.h index 26e48662b5..1b09c813de 100644 --- a/libnm/nm-vpn-editor.h +++ b/libnm/nm-vpn-editor.h @@ -83,4 +83,4 @@ gboolean nm_vpn_editor_update_connection (NMVpnEditor *editor, G_END_DECLS -#endif /* __NM_VPN_EDITOR_H__ */ +#endif /* __NM_VPN_EDITOR_H__ */ diff --git a/m4/introspection.m4 b/m4/introspection.m4 index 1dc1556da1..3b4fc6b813 100644 --- a/m4/introspection.m4 +++ b/m4/introspection.m4 @@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ],[dnl AC_ARG_ENABLE(introspection, AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, + [Enable introspection for this build]),, [enable_introspection=auto]) ])dnl @@ -44,7 +44,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], dnl Canonicalize enable_introspection enable_introspection=$found_introspection ],dnl - [dnl + [dnl AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ])dnl diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h index a50a7d851b..22fae29397 100644 --- a/src/devices/nm-device-ethernet.h +++ b/src/devices/nm-device-ethernet.h @@ -24,12 +24,12 @@ #include "nm-device.h" -#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ()) -#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet)) -#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) -#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET)) -#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET)) -#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) +#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ()) +#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet)) +#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) +#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET)) +#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET)) +#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) #define NM_DEVICE_ETHERNET_SPEED "speed" #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels" @@ -37,12 +37,12 @@ struct _NMDeviceEthernetPrivate; typedef struct { - NMDevice parent; - struct _NMDeviceEthernetPrivate *_priv; + NMDevice parent; + struct _NMDeviceEthernetPrivate *_priv; } NMDeviceEthernet; typedef struct { - NMDeviceClass parent; + NMDeviceClass parent; } NMDeviceEthernetClass; GType nm_device_ethernet_get_type (void); diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index 4aa7d4364c..b0d3ffa4f6 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -141,4 +141,4 @@ gboolean nm_device_match_hwaddr (NMDevice *device, NMConnection *connection, gboolean fail_if_no_hwaddr); -#endif /* NM_DEVICE_PRIVATE_H */ +#endif /* NM_DEVICE_PRIVATE_H */ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 94906224ac..633690ebd9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -436,7 +436,7 @@ typedef struct _NMDevicePrivate { }; NMIP6Config * con_ip6_config; /* config from the setting */ AppliedConfig wwan_ip6_config; - AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */ + AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */ NMIP6Config * ext_ip6_config; /* Stuff added outside NM */ NMIP6Config * ext_ip6_config_captured; /* Configuration captured from platform. */ GSList * vpn6_configs; /* VPNs which use this device */ @@ -10899,7 +10899,7 @@ start_ping (NMDevice *self, priv->gw_ping.log_domain = log_domain; priv->gw_ping.address = g_strdup (address); priv->gw_ping.binary = g_strdup (binary); - priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */ + priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */ if (spawn_ping (self)) { priv->gw_ping.watch = g_child_watch_add (priv->gw_ping.pid, ip_check_ping_watch_cb, self); diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 74d920a8da..acb14a014e 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -439,19 +439,19 @@ dhclient_start (NMDhcpClient *client, while (prefixes--) g_ptr_array_add (argv, (gpointer) "-P"); } - g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */ + g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */ g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path); if (pid_file) { - g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */ + g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */ g_ptr_array_add (argv, (gpointer) pid_file); } - g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */ + g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */ g_ptr_array_add (argv, (gpointer) priv->lease_file); if (priv->conf_file) { - g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */ + g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */ g_ptr_array_add (argv, (gpointer) priv->conf_file); } diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c index d7ddd1943a..a03f9d05b5 100644 --- a/src/dhcp/nm-dhcp-dhcpcanon.c +++ b/src/dhcp/nm-dhcp-dhcpcanon.c @@ -118,16 +118,16 @@ dhcpcanon_start (NMDhcpClient *client, argv = g_ptr_array_new (); g_ptr_array_add (argv, (gpointer) dhcpcanon_path); - g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */ + g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */ g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path); if (pid_file) { - g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */ + g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */ g_ptr_array_add (argv, (gpointer) pid_file); } if (priv->conf_file) { - g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */ + g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */ g_ptr_array_add (argv, (gpointer) priv->conf_file); } diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c index 66a31acf10..7a18d88b67 100644 --- a/src/dhcp/nm-dhcp-dhcpcd.c +++ b/src/dhcp/nm-dhcp-dhcpcd.c @@ -114,18 +114,18 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last argv = g_ptr_array_new (); g_ptr_array_add (argv, (gpointer) dhcpcd_path); - g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */ + g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */ - g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */ + g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */ - g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */ + g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */ /* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */ g_ptr_array_add (argv, (gpointer) "-A"); - g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ + g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ - g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ + g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path); #ifdef DHCPCD_SUPPORTS_IPV6 diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index 5bde924c27..476e27e71a 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -304,7 +304,7 @@ activate: &local_error)) { _LOGW ("rollback: reactivation of connection %s/%s failed: %s", nm_connection_get_id ((NMConnection *) connection), - nm_connection_get_uuid ((NMConnection * ) connection), + nm_connection_get_uuid ((NMConnection *) connection), local_error->message); g_clear_error (&local_error); result = NM_ROLLBACK_RESULT_ERR_FAILED; diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index a2082b05d7..cdab00da57 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -404,7 +404,7 @@ struct nl80211_bss_info { gboolean valid; }; -#define WLAN_EID_SSID 0 +#define WLAN_EID_SSID 0 static void find_ssid (guint8 *ies, guint32 ies_len, diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c index 8421afc202..014998a695 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c @@ -129,8 +129,8 @@ _recursive_ifparser (const char *eni_file, int quiet) while (!feof(inp)) { - char *token[128]; /* 255 chars can only be split into 127 tokens */ - char value[255]; /* large enough to join previously split tokens */ + char *token[128]; /* 255 chars can only be split into 127 tokens */ + char value[255]; /* large enough to join previously split tokens */ char *safeptr; int toknum; int len = 0; @@ -169,7 +169,7 @@ _recursive_ifparser (const char *eni_file, int quiet) continue; } -#define SPACES " \t" +#define SPACES " \t" /* tokenize input; */ for (toknum = 0, token[toknum] = strtok_r(line, SPACES, &safeptr); token[toknum] != NULL; diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c index d53a13c4b6..5198d75fb9 100644 --- a/src/supplicant/nm-supplicant-settings-verify.c +++ b/src/supplicant/nm-supplicant-settings-verify.c @@ -222,10 +222,10 @@ validate_type_keyword (const struct Opt * opt, const char * value, const guint32 len) { - char ** allowed; - gchar ** candidates = NULL; - char ** candidate; - gboolean found = FALSE; + char **allowed; + gchar **candidates = NULL; + char **candidate; + gboolean found = FALSE; g_return_val_if_fail (opt != NULL, FALSE); g_return_val_if_fail (value != NULL, FALSE); diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h index f75827ec60..747cf15274 100644 --- a/src/supplicant/nm-supplicant-types.h +++ b/src/supplicant/nm-supplicant-types.h @@ -21,9 +21,9 @@ #ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__ #define __NETWORKMANAGER_SUPPLICANT_TYPES_H__ -#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1" -#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1" -#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1" +#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1" +#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1" +#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1" typedef struct _NMSupplicantManager NMSupplicantManager; typedef struct _NMSupplicantInterface NMSupplicantInterface; |