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.
This commit is contained in:
@@ -172,8 +172,8 @@ done:
|
|||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
nm_main_utils_early_setup (const char *progname,
|
nm_main_utils_early_setup (const char *progname,
|
||||||
char **argv[],
|
|
||||||
int *argc,
|
int *argc,
|
||||||
|
char **argv[],
|
||||||
GOptionEntry *options,
|
GOptionEntry *options,
|
||||||
void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
|
void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
|
||||||
gpointer option_context_hook_data,
|
gpointer option_context_hook_data,
|
||||||
|
@@ -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_check_pidfile (const char *pidfile, const char *name);
|
||||||
|
|
||||||
gboolean nm_main_utils_early_setup (const char *progname,
|
gboolean nm_main_utils_early_setup (const char *progname,
|
||||||
char **argv[],
|
|
||||||
int *argc,
|
int *argc,
|
||||||
|
char **argv[],
|
||||||
GOptionEntry *options,
|
GOptionEntry *options,
|
||||||
void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
|
void (*option_context_hook) (gpointer user_data, GOptionContext *opt_ctx),
|
||||||
gpointer option_context_hook_data,
|
gpointer option_context_hook_data,
|
||||||
|
@@ -242,8 +242,8 @@ main (int argc, char *argv[])
|
|||||||
|
|
||||||
config_cli = nm_config_cmd_line_options_new ();
|
config_cli = nm_config_cmd_line_options_new ();
|
||||||
if (!nm_main_utils_early_setup ("NetworkManager",
|
if (!nm_main_utils_early_setup ("NetworkManager",
|
||||||
&argv,
|
|
||||||
&argc,
|
&argc,
|
||||||
|
&argv,
|
||||||
options,
|
options,
|
||||||
(void (*)(gpointer, GOptionContext *)) nm_config_cmd_line_options_add_to_entries,
|
(void (*)(gpointer, GOptionContext *)) nm_config_cmd_line_options_add_to_entries,
|
||||||
config_cli,
|
config_cli,
|
||||||
|
@@ -311,8 +311,8 @@ main (int argc, char *argv[])
|
|||||||
setpgid (getpid (), getpid ());
|
setpgid (getpid (), getpid ());
|
||||||
|
|
||||||
if (!nm_main_utils_early_setup ("nm-iface-helper",
|
if (!nm_main_utils_early_setup ("nm-iface-helper",
|
||||||
&argv,
|
|
||||||
&argc,
|
&argc,
|
||||||
|
&argv,
|
||||||
options,
|
options,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
|
Reference in New Issue
Block a user