From 6298b322816ec43cbf559ebc907a3d7b3bb3e90d Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 6 Feb 2023 16:36:47 +0100
Subject: [PATCH] nmcli/trivial: rename monitor functions in internal header
 file

Identifiers in our headers should have a "nm" prefix. Rename.

(cherry picked from commit d3e2e9dc20756aeeaadfd6eec5ee50fa24aaaf50)
---
 src/nmcli/connections.c | 2 +-
 src/nmcli/connections.h | 2 +-
 src/nmcli/devices.c     | 2 +-
 src/nmcli/devices.h     | 2 +-
 src/nmcli/general.c     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index 610248c865..059bbbf99a 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -10117,7 +10117,7 @@ nmc_command_func_connection(const NMCCommand *cmd, NmCli *nmc, int argc, const c
 }
 
 void
-monitor_connections(NmCli *nmc)
+nmc_monitor_connections(NmCli *nmc)
 {
     do_connection_monitor(NULL, nmc, 0, NULL);
 }
diff --git a/src/nmcli/connections.h b/src/nmcli/connections.h
index c610766a62..48c981704d 100644
--- a/src/nmcli/connections.h
+++ b/src/nmcli/connections.h
@@ -8,7 +8,7 @@
 
 #include "nmcli.h"
 
-void monitor_connections(NmCli *nmc);
+void nmc_monitor_connections(NmCli *nmc);
 
 const char *nmc_connection_check_deprecated(NMConnection *c);
 
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index f71a7d036d..dd7007ffbd 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -5328,7 +5328,7 @@ nmc_command_func_device(const NMCCommand *cmd, NmCli *nmc, int argc, const char
 }
 
 void
-monitor_devices(NmCli *nmc)
+nmc_monitor_devices(NmCli *nmc)
 {
     do_devices_monitor(NULL, nmc, 0, NULL);
 }
diff --git a/src/nmcli/devices.h b/src/nmcli/devices.h
index 6214ea035a..7ed75909b3 100644
--- a/src/nmcli/devices.h
+++ b/src/nmcli/devices.h
@@ -12,7 +12,7 @@ void nmc_complete_device(NMClient *client, const char *prefix, gboolean wifi_onl
 
 void nmc_complete_bssid(NMClient *client, const char *ifname, const char *bssid_prefix);
 
-void monitor_devices(NmCli *nmc);
+void nmc_monitor_devices(NmCli *nmc);
 
 NMDevice **nmc_get_devices_sorted(NMClient *client);
 
diff --git a/src/nmcli/general.c b/src/nmcli/general.c
index b050d2b740..20471365a8 100644
--- a/src/nmcli/general.c
+++ b/src/nmcli/general.c
@@ -1632,6 +1632,6 @@ nmc_command_func_monitor(const NMCCommand *cmd, NmCli *nmc, int argc, const char
 
     nmc->should_wait++;
 
-    monitor_devices(nmc);
-    monitor_connections(nmc);
+    nmc_monitor_devices(nmc);
+    nmc_monitor_connections(nmc);
 }