Clean up the debugging output

2 files changed, 3 insertions, 12 deletions

diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index e1dea33..05104fe 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -173,9 +173,7 @@ _fetch_connect(char *host, int port, int af, int verbose)
     struct addrinfo hints, *res, *res0;
     int sd, err;
 
-#ifndef NDEBUG
-    fprintf(stderr, "\033[1m---> %s:%d\033[m\n", host, port);
-#endif
+    DEBUG(fprintf(stderr, "\033[1m---> %s:%d\033[m\n", host, port));
 
     if (verbose)
 	_fetch_info("looking up %s", host);
@@ -292,6 +290,7 @@ _fetch_getln(int fd, char **buf, size_t *size, size_t *len)
 	}
     } while (c != '\n');
     
+    DEBUG(fprintf(stderr, "\033[1m<<< %.*s\033[m", (int)*len, *buf));
     return 0;
 }
 
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index be1515b..cb12eaa 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -138,18 +138,12 @@ _ftp_chkerr(int cd)
 	_fetch_syserr();
 	return -1;
     }
-#ifndef NDEBUG
-    _fetch_info("got reply '%.*s'", lr_length - 2, last_reply);
-#endif
     if (isftpinfo(last_reply)) {
 	while (!isftpreply(last_reply)) {
 	    if (_fetch_getln(cd, &last_reply, &lr_size, &lr_length) == -1) {
 		_fetch_syserr();
 		return -1;
 	    }
-#ifndef NDEBUG
-	    _fetch_info("got reply '%.*s'", lr_length - 2, last_reply);
-#endif
 	}
     }
 
@@ -189,9 +183,7 @@ _ftp_cmd(int cd, char *fmt, ...)
 	_fetch_syserr();
 	return -1;
     }
-#ifndef NDEBUG
-    _fetch_info("sending '%s'", msg);
-#endif
+    DEBUG(fprintf(stderr, "\033[1m>>> %s\n\033[m", msg));
     iov[0].iov_base = msg;
     iov[0].iov_len = strlen(msg);
     iov[1].iov_base = ENDL;