diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-03-13 20:47:03 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-19 15:51:07 +0100 |
| commit | 4ffd74e8efc8060c7e4b0c5eed95f9b2e4cbcdf4 (patch) | |
| tree | 6dc14d3d48ca95305628e39f5043fa355b86aeb0 | |
| parent | f0740aff88a83c228aa22cfd4c567e31e36bb504 (diff) | |
| download | NetworkManager-4ffd74e8efc8060c7e4b0c5eed95f9b2e4cbcdf4.tar.gz | |
main/trivial: change order of arguments for nm_main_utils_early_setup()
Change the order of the argv and argc argument to match
the main() function.
| -rw-r--r-- | src/main-utils.c | 2 | ||||
| -rw-r--r-- | src/main-utils.h | 2 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/nm-iface-helper.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main-utils.c b/src/main-utils.c index 164dc84a99..1c479d8a72 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -172,8 +172,8 @@ done: gboolean nm_main_utils_early_setup (const char *progname, - char **argv[], int *argc, + char **argv[], GOptionEntry *options, void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx), gpointer option_context_hook_data, diff --git a/src/main-utils.h b/src/main-utils.h index 9b29866be0..88d217a559 100644 --- a/src/main-utils.h +++ b/src/main-utils.h @@ -30,8 +30,8 @@ gboolean nm_main_utils_write_pidfile (const char *pidfile); gboolean nm_main_utils_check_pidfile (const char *pidfile, const char *name); gboolean nm_main_utils_early_setup (const char *progname, - char **argv[], int *argc, + char **argv[], GOptionEntry *options, void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx), gpointer option_context_hook_data, diff --git a/src/main.c b/src/main.c index 3df3e11eb4..d76bbffa3b 100644 --- a/src/main.c +++ b/src/main.c @@ -242,8 +242,8 @@ main (int argc, char *argv[]) config_cli = nm_config_cmd_line_options_new (); if (!nm_main_utils_early_setup ("NetworkManager", - &argv, &argc, + &argv, options, (void (*)(gpointer, GOptionContext *)) nm_config_cmd_line_options_add_to_entries, config_cli, diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 49eda87718..09054c0237 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -311,8 +311,8 @@ main (int argc, char *argv[]) setpgid (getpid (), getpid ()); if (!nm_main_utils_early_setup ("nm-iface-helper", - &argv, &argc, + &argv, options, NULL, NULL, |