fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: merge implementations for do_networking_on_off()

Browse source
This commit is contained in:
Thomas Haller 2020-04-05 13:00:38 +02:00
parent d39f5c264b
commit 3a451141bd
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/cli/general.c
View file

@ -950,8 +950,12 @@ _do_networking_on_off_cb (GObject *object, GAsyncResult *result, gpointer user_d
} }
static NMCResultCode static NMCResultCode
do_networking_on_off (NmCli *nmc, int argc, char **argv, gboolean enable) do_networking_on_off (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv)
{ {
gboolean enable = nm_streq (cmd->cmd, "on");
next_arg (nmc, &argc, &argv, NULL);
if (nmc->complete) if (nmc->complete)
return nmc->return_value; return nmc->return_value;
@ -972,20 +976,6 @@ do_networking_on_off (NmCli *nmc, int argc, char **argv, gboolean enable)
return nmc->return_value; return nmc->return_value;
} }
static NMCResultCode
do_networking_on (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv)
{
next_arg (nmc, &argc, &argv, NULL);
return do_networking_on_off (nmc, argc, argv, TRUE);
}
static NMCResultCode
do_networking_off (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv)
{
next_arg (nmc, &argc, &argv, NULL);
return do_networking_on_off (nmc, argc, argv, FALSE);
}
static NMCResultCode static NMCResultCode
do_networking_connectivity (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv) do_networking_connectivity (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv)
{ {
@ -1036,8 +1026,8 @@ NMCResultCode
nmc_command_func_networking (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv) nmc_command_func_networking (const NMCCommand *cmd, NmCli *nmc, int argc, char **argv)
{ {
static const NMCCommand cmds[] = { static const NMCCommand cmds[] = {
{ "on", do_networking_on, usage_networking_on, TRUE, TRUE }, { "on", do_networking_on_off, usage_networking_on, TRUE, TRUE },
{ "off", do_networking_off, usage_networking_off, TRUE, TRUE }, { "off", do_networking_on_off, usage_networking_off, TRUE, TRUE },
{ "connectivity", do_networking_connectivity, usage_networking_connectivity, TRUE, TRUE }, { "connectivity", do_networking_connectivity, usage_networking_connectivity, TRUE, TRUE },
{ NULL, do_networking_show, usage_networking, TRUE, TRUE }, { NULL, do_networking_show, usage_networking, TRUE, TRUE },
}; };