Comment out all debugging code.

8 files changed, 20 insertions, 30 deletions

diff --git a/backends/server/backend-server.c b/backends/server/backend-server.c
index 46b15420..8b4d6403 100644
--- a/backends/server/backend-server.c
+++ b/backends/server/backend-server.c
@@ -50,11 +50,13 @@ _open_server (glibtop *server, glibtop_backend *backend,
     backend->_priv = glibtop_calloc_r
 	(server, 1, sizeof (glibtop_backend_private));
 
+#ifdef DEBUG
     fprintf (stderr, "open_server - %p, %p, %p\n", server, backend,
 	     backend->_priv);
 
     fprintf (stderr, "Opening pipe to server (%s).\n",
 	     LIBGTOP_SERVER);
+#endif
 
     if (pipe (backend->_priv->input) ||
 	pipe (backend->_priv->output)) {
diff --git a/backends/server/command.c b/backends/server/command.c
index a58f118e..325dea67 100644
--- a/backends/server/command.c
+++ b/backends/server/command.c
@@ -69,16 +69,20 @@ glibtop_call_i (glibtop *server, glibtop_backend *backend, unsigned command,
     glibtop_write_i (server, backend, sizeof (glibtop_command), &cmnd);
 
     if (data_size) {
+#ifdef SLAVE_DEBUG
 	fprintf (stderr, "SENDING %d bytes of DATA.\n", data_size);
+#endif
 	glibtop_write_i (server, backend, data_size, data_buf);
     }
 
     glibtop_read_i (server, backend, sizeof (glibtop_response), &resp);
 
+#ifdef SLAVE_DEBUG
     fprintf (stderr, "RESPONSE: %d - %d - %ld - %ld - %p - %ld\n",
 	     resp.retval, resp.glibtop_errno,
 	     (long) resp.recv_size, (long) resp.data_size,
 	     recv_ptr, (long) recv_size);
+#endif
     
     if (retval_ptr)
 	*retval_ptr = resp.glibtop_errno;
diff --git a/backends/server/io.c b/backends/server/io.c
index b138074a..c5ff5cbc 100644
--- a/backends/server/io.c
+++ b/backends/server/io.c
@@ -29,7 +29,7 @@ void
 do_output (int s, glibtop_response *resp, const void *recv_ptr,
 	   const void *data_ptr)
 {
-#ifdef REAL_DEBUG
+#ifdef DEBUG
     fprintf (stderr, "Really writing %d bytes.\n",
 	     sizeof (glibtop_response));
 #endif
@@ -43,7 +43,7 @@ do_output (int s, glibtop_response *resp, const void *recv_ptr,
     }
 
     if (resp->recv_size) {
-#ifdef REAL_DEBUG
+#ifdef DEBUG
 	fprintf (stderr, "Writing %ld bytes of data.\n",
 		 (long) resp->recv_size);
 #endif
@@ -58,7 +58,7 @@ do_output (int s, glibtop_response *resp, const void *recv_ptr,
     }
 
     if (resp->data_size) {
-#ifdef REAL_DEBUG
+#ifdef DEBUG
 	fprintf (stderr, "Writing %ld bytes of extra data.\n",
 		 (long) resp->data_size);
 #endif
@@ -104,7 +104,7 @@ do_read (int s, void *ptr, size_t total_size)
 	tmp_ptr += nread;
 	ptr = tmp_ptr;
 
-#ifdef REAL_DEBUG
+#ifdef DEBUG
 	fprintf (stderr, "READ (%d): %d - %d - %d\n",
 		 nread, already_read, remaining, total_size);
 #endif
diff --git a/backends/server/read.c b/backends/server/read.c
index ece079c6..7e8e17ec 100644
--- a/backends/server/read.c
+++ b/backends/server/read.c
@@ -29,10 +29,6 @@
 
 #include <glibtop-backend-private.h>
 
-#ifndef DEBUG
-#define DEBUG 1
-#endif
-
 void
 glibtop_read_i (glibtop *server, glibtop_backend *backend,
 		size_t size, void *buf)
@@ -48,7 +44,9 @@ glibtop_read_i (glibtop *server, glibtop_backend *backend,
 
     ret = read (backend->_priv->input [0], buf, size);
 
+#ifdef DEBUG
     fprintf (stderr, "LIBRARY: read %d bytes.\n", ret);
+#endif
 
     if (ret < 0)
 	glibtop_error_io_r (server, "read %d bytes", size);
diff --git a/backends/server/read_data.c b/backends/server/read_data.c
index 5fa18b6a..df134fec 100644
--- a/backends/server/read_data.c
+++ b/backends/server/read_data.c
@@ -30,10 +30,6 @@
 
 #include <glibtop-backend-private.h>
 
-#ifndef DEBUG
-#define DEBUG 1
-#endif
-
 void *
 glibtop_read_data_i (glibtop *server, glibtop_backend *backend)
 {
diff --git a/backends/server/server.c b/backends/server/server.c
index 3cf23158..5500380b 100644
--- a/backends/server/server.c
+++ b/backends/server/server.c
@@ -119,8 +119,10 @@ handle_slave_connection (int input, int output)
 	int retval, func_retval;
 	glibtop_response resp;
 
+#ifdef DEBUG
 	fprintf (stderr, "Slave %d received command "
 		 "%ld from client.\n", getpid (), (long) cmnd->command);
+#endif
 
 	if (cmnd->send_size >= BUFSIZ)
 	    glibtop_error ("Client sent %d bytes, but buffer is %d",
@@ -132,7 +134,7 @@ handle_slave_connection (int input, int output)
 	memset (parameter, 0, sizeof (parameter));
 
 	if (cmnd->send_size) {
-#ifdef SLAVE_DEBUG
+#ifdef DEBUG
 	    fprintf (stderr, "Client has %d bytes of data.\n",
 		     cmnd->send_size);
 #endif
@@ -140,7 +142,7 @@ handle_slave_connection (int input, int output)
 	    send_size = cmnd->send_size;
 	    do_read (input, parameter, send_size);
 	} else if (cmnd->param_size) {
-#ifdef SLAVE_DEBUG
+#ifdef DEBUG
 	    fprintf (stderr, "Client has %d bytes of parameter data.\n",
 		     cmnd->param_size);
 #endif
@@ -149,8 +151,10 @@ handle_slave_connection (int input, int output)
 	}
 
 	if (cmnd->data_size) {
+#ifdef DEBUG
 	    fprintf (stderr, "CLIENT has %d bytes of extra data for us.\n",
 		     cmnd->data_size);
+#endif
 
 	    data_ptr = glibtop_malloc_r (server, cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
@@ -164,6 +168,7 @@ handle_slave_connection (int input, int output)
 					   &recv_data_ptr, &recv_data_size,
 					   &func_retval);
 
+#ifdef DEBUG
 	fprintf (stderr, "Retval %d / %d - %p - %d\n",
 		 retval, func_retval, recv_ptr, recv_size);
 
@@ -171,6 +176,7 @@ handle_slave_connection (int input, int output)
 	    fprintf (stderr, "Returning %d bytes of data from %p.\n",
 		     recv_data_size, recv_data_ptr);
 	}
+#endif
 
 	memset (&resp, 0, sizeof (glibtop_response));
 
diff --git a/backends/server/server.h b/backends/server/server.h
index 1273babd..2622e29f 100644
--- a/backends/server/server.h
+++ b/backends/server/server.h
@@ -47,18 +47,6 @@
 
 BEGIN_LIBGTOP_DECLS
 
-#ifndef DEBUG
-#define DEBUG
-#endif
-
-#ifndef SLAVE_DEBUG
-#define SLAGE_DEBUG
-#endif
-
-#ifndef REAL_DEBUG
-#define REAL_DEBUG
-#endif
-
 /* Some don't have LOG_PERROR */
 #ifndef LOG_PERROR
 #define LOG_PERROR 0
diff --git a/backends/server/write.c b/backends/server/write.c
index 3f228a1a..723dc0d7 100644
--- a/backends/server/write.c
+++ b/backends/server/write.c
@@ -29,10 +29,6 @@
 
 #include <glibtop-backend-private.h>
 
-#ifndef DEBUG
-#define DEBUG 1
-#endif
-
 void
 glibtop_write_i (glibtop *server, glibtop_backend *backend,
 		 size_t size, const void *buf)