Removed debug printfs.

The code is doing what it's supposed to do now, so I've removed all of
the debug output.

Author: dtynan

buffer.c

@@ -95,8 +95,6 @@ buf_read(struct channel *chp)
 		buf_free(bp);
 		return(-1);
 	}
-	printf("Read %d bytes.\n", bp->size);
-	hexdump(bp->data, 0, bp->size);
 	/*
 	 * Stick the buffer on the end of the channel read queue.
 	 */
@@ -130,11 +128,8 @@ buf_write(struct channel *chp, int wrfd)
 	 */
 	bp = chp->bhead;
 	chp->bhead = bp->next;
-	if ((n = write(wrfd, bp->data, bp->size)) != bp->size) {
-		syslog(LOG_INFO, "buffer write failure");
+	if ((n = write(wrfd, bp->data, bp->size)) != bp->size)
 		return(-1);
-	}
-	printf("Wrote %d bytes.\n", n);
 	/*
 	 * Release the buffer and we're done.
 	 */

channel.c

@@ -80,7 +80,6 @@ chan_alloc()
 	chp->totread = 0;
 	chp->last_read = 0;
 	chp->next = NULL;
-	printf("New channel %d.\n", chp->channo);
 	return(chp);
 }
 
@@ -117,7 +116,6 @@ chan_process(struct queue *qp)
 			 * Channel has failed. Clean this up and move it to the
 			 * free Q.
 			 */
-			printf("Channel%d failure: %d\n", chp->channo, fail);
 			chan_readoff(chp->fd);
 			chan_writeoff(chp->fd);
 			close(chp->fd);
@@ -143,7 +141,6 @@ chan_poll()
 	 */
 	memcpy((char *)&rfds, (char *)&mrdfdset, sizeof(fd_set));
 	memcpy((char *)&wfds, (char *)&mwrfdset, sizeof(fd_set));
-	printf(">>>> TOP OF LOOP: Select on %d FDs...\n", maxfds);
 	if (contention()) {
 		/*
 		 * We have contention - at least two channels want the device.
@@ -153,13 +150,7 @@ chan_poll()
 		tvp = &tval;
 		tvp->tv_sec = timeout;
 		tvp->tv_usec = 0;
-		printf("Timeout=%ds\n", timeout);
-	} else {
-		tvp = NULL;
-		printf("No timeout\n");
 	}
-	if (busyq.head != NULL)
-		printf("Head of queue is chan%d (contention=%d)\n", busyq.head->channo, contention());
 	if ((n = select(maxfds, &rfds, &wfds, NULL, tvp)) < 0) {
 		syslog(LOG_ERR, "select failure in chan_poll: %m");
 		exit(1);
@@ -171,7 +162,6 @@ chan_poll()
 	 * the next guy (assuming there is one).
 	 */
 	time(&last_event);
-	printf("Select returned %d.\n", n);
 	if (contention() && (last_event - busyq.head->last_read) >= timeout) {
 		qmove(busyq.head, IDLE_Q);
 		slave_promote();
@@ -194,7 +184,6 @@ chan_poll()
 void
 chan_readon(int fd)
 {
-	printf("Read ON on fd%d\n", fd);
 	if (fd < 0)
 		return;
 	if (maxfds <= fd)
@@ -208,7 +197,6 @@ chan_readon(int fd)
 void
 chan_readoff(int fd)
 {
-	printf("Read OFF on fd%d\n", fd);
 	if (fd >= 0)
 		FD_CLR(fd, &mrdfdset);
 }
@@ -219,7 +207,6 @@ chan_readoff(int fd)
 void
 chan_writeon(int fd)
 {
-	printf("Write ON on fd%d\n", fd);
 	if (fd < 0)
 		return;
 	if (maxfds <= fd)
@@ -233,7 +220,6 @@ chan_writeon(int fd)
 void
 chan_writeoff(int fd)
 {
-	printf("Write OFF on fd%d\n", fd);
 	if (fd >= 0)
 		FD_CLR(fd, &mwrfdset);
 }

process.c

@@ -40,7 +40,6 @@ struct	channel		*master = NULL;
 int
 master_read()
 {
-	printf("MASTER Read!\n");
 	/*
 	 * Do we have any slaves? If not, dump what we've just read.
 	 */
@@ -56,7 +55,6 @@ master_read()
 		chan_readoff(master->fd);
 	else
 		chan_readon(master->fd);
-	printf("Master has %d bytes buffered.\n", master->totread);
 	/*
 	 * OK, queue up the slave for writing...
 	 */
@@ -72,7 +70,6 @@ master_write()
 {
 	int n;
 
-	printf("MASTER Write!\n");
 	if (busyq.head == NULL) {
 		/*
 		 * Oops! No slaves. Nothing to see, here...
@@ -84,7 +81,6 @@ master_write()
 	 * Write data from the current head of the busy Q to the
 	 * master socket. Disable writes if there's no more data.
 	 */
-	printf("Slave channel %d wants to write.\n", busyq.head->channo);
 	n = buf_write(busyq.head, master->fd);
 	if (busyq.head->bhead == NULL)
 		chan_writeoff(master->fd);
@@ -99,7 +95,6 @@ slave_read(struct channel *chp)
 {
 	int n;
 
-	printf("SLAVE Read on channel %d\n", chp->channo);
 	/*
 	 * If we've a lot of data backed up, stop reading (for now).
 	 */
@@ -125,7 +120,6 @@ slave_read(struct channel *chp)
 int
 slave_write(struct channel *chp)
 {
-	printf("SLAVE Write on channel %d\n", chp->channo);
 	if (master->bhead == NULL || chp != busyq.head) {
 		/*
 		 * Oops! Nothing to write. Dunno how we got here, but
@@ -151,7 +145,6 @@ void
 slave_promote()
 {
 	if (busyq.head && busyq.head->bhead != NULL) {
-		printf("Promoting chan%d to head of queue...\n", busyq.head->channo);
 		chan_writeon(master->fd);
 		busyq.head->last_read = last_event;
 	}

serial.c

@@ -72,7 +72,6 @@ serial_master(char *argstr)
 	char *settings, *params[4];
 	struct termios tios;
 
-	printf("Serial Init: [%s]\n", argstr);
 	/*
 	 * Baud rate and settings are configured as follows:
 	 * /dev/ttyUSB0:9600:8N1 (for example).
@@ -92,7 +91,6 @@ serial_master(char *argstr)
 	/*
 	 * Get and set the tty parameters.
 	 */
-	printf(">SERIAL FD%d:, Spd: %d, Params: [%s]\n", master->fd, baud, settings);
 	if (tcgetattr(master->fd, &tios) < 0) {
 		perror("serial_master: tcgetattr failed");
 		exit(1);

tcpip.c

@@ -48,7 +48,6 @@ tcp_init(int port)
 	int yes = 1;
 	struct sockaddr_in sin;
 
-	printf("TCP INIT: Port%d\n", port);
 	if ((accept_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		perror("tcp_init: socket failed");
 		exit(1);
@@ -66,7 +65,6 @@ tcp_init(int port)
 		exit(1);
 	}
 	listen(accept_fd, 64);
-	printf("LISTEN Socket UP!\n");
 	chan_readon(accept_fd);
 }
 
@@ -81,15 +79,12 @@ tcp_newconn()
 	struct channel *chp;
 	struct sockaddr_in sin;
 
-	printf("New connection received.\n");
-	len = sizeof(struct sockaddr_in);
 	chp = chan_alloc();
-	printf("Going to accept...\n");
+	len = sizeof(struct sockaddr_in);
 	if ((chp->fd = accept(accept_fd, (struct sockaddr *)&sin, &len)) < 0) {
 		syslog(LOG_INFO, "tcp_newconn failed: %m");
 		return(-1);
 	}
-	printf("Back from accept(). Addr:[%08x]\n", sin.sin_addr.s_addr);
 	chan_readon(chp->fd);
 	return(1);
 }
@@ -105,7 +100,6 @@ tcp_master(char *argstr)
 	struct sockaddr_in sin;
 	in_addr_t addr;
 
-	printf("TCP Remote Init: [%s]\n", argstr);
 	if ((i = crack(argstr, params, 4)) < 1)
 		usage();
 	host = params[0];
@@ -121,7 +115,6 @@ tcp_master(char *argstr)
 		}
 		memcpy((char *)&addr, hp->h_addr, hp->h_length);
 	}
-	printf("%08x\n", addr);
 	master = chan_alloc();
 	if ((master->fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		perror("tcp_master: socket");