From de88a59af21d8d7b85fe25c6dc436a925e2d3121 Mon Sep 17 00:00:00 2001
From: Greg Carl <26096779+snowgoer540@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:57:29 -0500
Subject: [PATCH] task and user_intf:  make debug messages require debug flag

---
 src/emc/task/emcsvr.cc      | 24 +++++++++++++-----------
 src/emc/task/emctaskmain.cc | 22 ++++++++++++----------
 src/emc/usr_intf/halui.cc   | 21 +++++++++++----------
 src/emc/usr_intf/shcom.cc   | 21 +++++++++++----------
 4 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/emc/task/emcsvr.cc b/src/emc/task/emcsvr.cc
index b39719bac2e..b2550c8fc8c 100644
--- a/src/emc/task/emcsvr.cc
+++ b/src/emc/task/emcsvr.cc
@@ -100,17 +100,19 @@ static int iniLoad(const char *filename)
         }
     }
 
-    inistring = inifile.Find("VERSION", "EMC");
-    strncpy(version, inistring.value_or("unknown"), LINELEN-1);
-
-    inistring = inifile.Find("MACHINE", "EMC");
-    strncpy(machine, inistring.value_or("unknown"), LINELEN-1);
-
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) emcsvr: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        inistring = inifile.Find("VERSION", "EMC");
+        strncpy(version, inistring.value_or("unknown"), LINELEN-1);
+
+        inistring = inifile.Find("MACHINE", "EMC");
+        strncpy(machine, inistring.value_or("unknown"), LINELEN-1);
+
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) emcsvr: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
+    }
 
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global
diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
index ec8a4b851f3..3293bb0e120 100644
--- a/src/emc/task/emctaskmain.cc
+++ b/src/emc/task/emctaskmain.cc
@@ -3163,16 +3163,18 @@ static int iniLoad(const char *filename)
         }
     }
 
-    inistring = inifile.Find("VERSION", "EMC");
-    rtapi_strlcpy(version, inistring.value_or("unknown"), LINELEN-1);
-
-    inistring = inifile.Find("MACHINE", "EMC");
-    rtapi_strlcpy(machine, inistring.value_or("unknown"), LINELEN-1);
-    extern char *program_invocation_short_name;
-    rcs_print(
-	"%s (%d) task: machine '%s'  version '%s'\n",
-	program_invocation_short_name, getpid(), machine, version
-    );
+	if (emc_debug & EMC_DEBUG_CONFIG) {
+		inistring = inifile.Find("VERSION", "EMC");
+		rtapi_strlcpy(version, inistring.value_or("unknown"), LINELEN-1);
+
+		inistring = inifile.Find("MACHINE", "EMC");
+		rtapi_strlcpy(machine, inistring.value_or("unknown"), LINELEN-1);
+		extern char *program_invocation_short_name;
+		rcs_print(
+		"%s (%d) task: machine '%s'  version '%s'\n",
+		program_invocation_short_name, getpid(), machine, version
+		);
+	}
 
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global
diff --git a/src/emc/usr_intf/halui.cc b/src/emc/usr_intf/halui.cc
index 6d9ffb97583..c392430d427 100644
--- a/src/emc/usr_intf/halui.cc
+++ b/src/emc/usr_intf/halui.cc
@@ -1452,19 +1452,20 @@ static int iniLoad(const char *filename)
 	    strncpy(version, *inistring, LINELEN-1);
     }
 
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        if ((inistring = inifile.Find("MACHINE", "EMC"))) {
+            strncpy(machine, *inistring, LINELEN-1);
+        } else {
+            strncpy(machine, "unknown", LINELEN-1);
+        }
 
-    if ((inistring = inifile.Find("MACHINE", "EMC"))) {
-	    strncpy(machine, *inistring, LINELEN-1);
-    } else {
-	    strncpy(machine, "unknown", LINELEN-1);
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) halui: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
     }
 
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) halui: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
-
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global
 	rtapi_strxcpy(emc_nmlfile, *inistring);
diff --git a/src/emc/usr_intf/shcom.cc b/src/emc/usr_intf/shcom.cc
index e95e528ba4c..6fc27756fe7 100644
--- a/src/emc/usr_intf/shcom.cc
+++ b/src/emc/usr_intf/shcom.cc
@@ -1324,19 +1324,20 @@ int iniLoad(const char *filename)
 	    strncpy(version, *inistring, LINELEN-1);
     }
 
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        if ((inistring = inifile.Find("MACHINE", "EMC"))) {
+            strncpy(machine, *inistring, LINELEN-1);
+        } else {
+            strncpy(machine, "unknown", LINELEN-1);
+        }
 
-    if ((inistring = inifile.Find("MACHINE", "EMC"))) {
-	    strncpy(machine, *inistring, LINELEN-1);
-    } else {
-	    strncpy(machine, "unknown", LINELEN-1);
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) shcom: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
     }
 
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) shcom: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
-
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 
 	// copy to global