New upstream version 1.42.0 upstream/1.42.0

1 files changed, 15 insertions, 15 deletions

diff --git a/src/core/nm-config.c b/src/core/nm-config.c
index 62e4e7ea..b7445362 100644
--- a/src/core/nm-config.c
+++ b/src/core/nm-config.c
@@ -575,63 +575,63 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo
 {
     GOptionGroup *group;
     GOptionEntry  config_options[] = {
-         {"config",
+        {"config",
           0,
           0,
           G_OPTION_ARG_FILENAME,
           &cli->config_main_file,
           N_("Config file location"),
           DEFAULT_CONFIG_MAIN_FILE},
-         {"config-dir",
+        {"config-dir",
           0,
           0,
           G_OPTION_ARG_FILENAME,
           &cli->config_dir,
           N_("Config directory location"),
           DEFAULT_CONFIG_DIR},
-         {"system-config-dir",
+        {"system-config-dir",
           0,
           0,
           G_OPTION_ARG_FILENAME,
           &cli->system_config_dir,
           N_("System config directory location"),
           DEFAULT_SYSTEM_CONFIG_DIR},
-         {"intern-config",
+        {"intern-config",
           0,
           0,
           G_OPTION_ARG_FILENAME,
           &cli->intern_config_file,
           N_("Internal config file location"),
           DEFAULT_INTERN_CONFIG_FILE},
-         {"state-file",
+        {"state-file",
           0,
           0,
           G_OPTION_ARG_FILENAME,
           &cli->state_file,
           N_("State file location"),
           DEFAULT_STATE_FILE},
-         {"no-auto-default",
+        {"no-auto-default",
           0,
           G_OPTION_FLAG_HIDDEN,
           G_OPTION_ARG_FILENAME,
           &cli->no_auto_default_file,
           N_("State file for no-auto-default devices"),
           DEFAULT_NO_AUTO_DEFAULT_FILE},
-         {"plugins",
+        {"plugins",
           0,
           0,
           G_OPTION_ARG_STRING,
           &cli->plugins,
           N_("List of plugins separated by ','"),
           NM_CONFIG_DEFAULT_MAIN_PLUGINS},
-         {"configure-and-quit",
+        {"configure-and-quit",
           0,
           G_OPTION_FLAG_OPTIONAL_ARG,
           G_OPTION_ARG_CALLBACK,
           parse_configure_and_quit,
           N_("Quit after initial configuration"),
           NULL},
-         {"debug",
+        {"debug",
           'd',
           0,
           G_OPTION_ARG_NONE,
@@ -639,29 +639,29 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo
           N_("Don't become a daemon, and log to stderr"),
           NULL},
 
-         /* These three are hidden for now, and should eventually just go away. */
-         {"connectivity-uri",
+        /* These three are hidden for now, and should eventually just go away. */
+        {"connectivity-uri",
           0,
           G_OPTION_FLAG_HIDDEN,
           G_OPTION_ARG_STRING,
           &cli->connectivity_uri,
           N_("An http(s) address for checking internet connectivity"),
           "http://example.com"},
-         {"connectivity-interval",
+        {"connectivity-interval",
           0,
           G_OPTION_FLAG_HIDDEN,
           G_OPTION_ARG_INT,
           &cli->connectivity_interval,
           N_("The interval between connectivity checks (in seconds)"),
           G_STRINGIFY(NM_CONFIG_DEFAULT_CONNECTIVITY_INTERVAL)},
-         {"connectivity-response",
+        {"connectivity-response",
           0,
           G_OPTION_FLAG_HIDDEN,
           G_OPTION_ARG_STRING,
           &cli->connectivity_response,
           N_("The expected start of the response"),
           NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE},
-         {0},
+        {0},
     };
 
     g_return_if_fail(opt_ctx);
@@ -680,7 +680,7 @@ nm_config_cmd_line_options_add_to_entries(NMConfigCmdLineOptions *cli, GOptionCo
 /*****************************************************************************/
 
 GKeyFile *
-nm_config_create_keyfile()
+nm_config_create_keyfile(void)
 {
     GKeyFile *keyfile;