From be63bf2d42aebffadd62cb418d767f72ac245c62 Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@src.gnome.org>
Date: Sat, 3 Oct 1998 03:01:22 +0000
Subject: [PATCH] Enclosed some debugging statements in `#ifdef DEBUG'.

---
 lib/open.c             | 16 +++++++++++++++-
 src/daemon/version.c   |  2 ++
 sysdeps/freebsd/open.c |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/open.c b/lib/open.c
index f3716071..75204731 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -57,34 +57,44 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		server->features = 0;
 		break;
 	case GLIBTOP_METHOD_INET:
+#ifdef DEBUG
 		fprintf (stderr, "Connecting to '%s' port %ld.\n",
 			 server->server_host, server->server_port);
+#endif
 		
 		connect_type = glibtop_make_connection
 			(server->server_host, server->server_port,
 			 &server->socket);
 		
+#ifdef DEBUG
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
+#endif
 		
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 		
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_UNIX:
+#ifdef DEBUG
 		fprintf (stderr, "Connecting to Unix Domain Socket.\n");
+#endif
 
 		connect_type = glibtop_make_connection
 			("unix", 0, &server->socket);
-		
+
+#ifdef DEBUG		
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
+#endif
 
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
 
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_PIPE:
+#ifdef DEBUG
 		fprintf (stderr, "Opening pipe to server (%s).\n",
 			 LIBGTOP_SERVER);
+#endif
 
 		if (pipe (server->input) || pipe (server->output))
 			glibtop_error_io_r (server, "cannot make a pipe");
@@ -153,14 +163,18 @@ glibtop_open_l (glibtop *server, const char *program_name,
 
 		memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps));
 
+#ifdef DEBUG
 		fprintf (stderr, "Server features are %lu.\n",
 			 server->features);
+#endif
 	}
 
 	/* In any case, we call the open functions of our own sysdeps
 	 * directory. */
 
+#ifdef DEBUG
 	fprintf (stderr, "Calling sysdeps open function.\n");
+#endif
 	
 	glibtop_init_s (&server, features, flags);
 }
diff --git a/src/daemon/version.c b/src/daemon/version.c
index a01e8b93..e6cdb7ff 100644
--- a/src/daemon/version.c
+++ b/src/daemon/version.c
@@ -38,7 +38,9 @@ glibtop_send_version (glibtop *server, int fd)
 	
 	size = strlen (buffer) + 1;
 
+#ifdef DEBUG
 	fprintf (stderr, "SERVER ID: |%s|\n", buffer);
+#endif
 
 	if (fd == 0) {
 		if (write (1, (const void *) &size, sizeof (size)) < 0)
diff --git a/sysdeps/freebsd/open.c b/sysdeps/freebsd/open.c
index 17ab20cc..3cea527d 100644
--- a/sysdeps/freebsd/open.c
+++ b/sysdeps/freebsd/open.c
@@ -50,7 +50,9 @@ void
 glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags)
 {
+#ifdef DEBUG
 	fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); 
+#endif
 
 	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */