[X2Go-Commits] [nx-libs] 274/429: nxcomp/Children.cpp: add macro checks around some log/stderr prints

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 90ff3d0256327bd4097568740a0ece24ca722989
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Feb 28 21:44:33 2021 +0100

    nxcomp/Children.cpp: add macro checks around some log/stderr prints
    
    This helps no flooding the output with (double) messages.
---
 nxcomp/src/Children.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index 40eccd9da..842db7fe5 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -257,15 +257,17 @@ int NXTransDialog(const char *caption, const char *message,
       }
     }
 
-    #ifdef WARNING
+    #ifdef TEST
     *logofs << "NXTransDialog: WARNING! Couldn't start '"
             << command << "'. " << "Error is " << EGET()
             << " '" << ESTR() << "'.\n" << logofs_flush;
     #endif
 
+    #ifdef WARNING
     cerr << "Warning" << ": Couldn't start '" << command
          << "'. Error is " << EGET() << " '" << ESTR()
          << "'.\n";
+    #endif
 
     //
     // Retry by looking for the default name
@@ -302,13 +304,15 @@ int NXTransDialog(const char *caption, const char *message,
       // FIXME: check if strncat would be better here
       snprintf(newPath + newLength, DEFAULT_STRING_LIMIT - newLength, "%s", oldPath);
 
-      #ifdef WARNING
+      #ifdef TEST
       *logofs << "NXTransDialog: WARNING! Trying with path '"
               << newPath << "'.\n" << logofs_flush;
       #endif
 
+      #ifdef WARNING
       cerr << "Warning" << ": Trying with path '" << newPath
            << "'.\n";
+      #endif
 
       //
       // Solaris doesn't seem to have

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git