From 3a451141bdd80770e75ff7162ab6a7fb4ada09cd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 5 Apr 2020 13:00:38 +0200
Subject: [PATCH] cli: merge implementations for do_networking_on_off()

---
 clients/cli/general.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/clients/cli/general.c b/clients/cli/general.c
index f36b8f0078..9b9030aea1 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -950,8 +950,12 @@ _do_networking_on_off_cb (GObject *object, GAsyncResult *result, gpointer user_d
 }
 
 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)
 		return nmc->return_value;
 
@@ -972,20 +976,6 @@ do_networking_on_off (NmCli *nmc, int argc, char **argv, gboolean enable)
 	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
 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)
 {
 	static const NMCCommand cmds[] = {
-		{ "on",           do_networking_on,           usage_networking_on,           TRUE, TRUE },
-		{ "off",          do_networking_off,          usage_networking_off,          TRUE, TRUE },
+		{ "on",           do_networking_on_off,       usage_networking_on,           TRUE, TRUE },
+		{ "off",          do_networking_on_off,       usage_networking_off,          TRUE, TRUE },
 		{ "connectivity", do_networking_connectivity, usage_networking_connectivity, TRUE, TRUE },
 		{ NULL,           do_networking_show,         usage_networking,              TRUE, TRUE },
 	};