remove majority of debug fprintfs

2 files changed, 0 insertions, 50 deletions

diff --git a/arm-probe/arm-probe.c b/arm-probe/arm-probe.c
index 834ba2d..ea5d435 100644
--- a/arm-probe/arm-probe.c
+++ b/arm-probe/arm-probe.c
@@ -329,14 +329,12 @@ int main(int argc, char *argv[])
 			printf("# date: %s\n", date);
 	}
 
-	fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 	if (!gethostname(hostname, sizeof hostname))
 		printf("# host: %s\n", hostname);
 
 	printf("#\n");
 
 	for (n = 0; n < AEPD_SHARED_MAX_REAL_CHANNELS; n++) {
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		for (m = 0; m < 3; m++) {
 			averages[n][m] = 0.0;
 			min[n][m] = 999;
@@ -350,7 +348,6 @@ int main(int argc, char *argv[])
 
 	while (loop) {
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		aepd_interface_result = aep_wait_for_next_result(aepd_interface);
 		if (!aepd_interface_result) {
 			fprintf(stderr, "!aepd_interface_result %s %d\n", __FILE__, __LINE__);
@@ -358,14 +355,11 @@ int main(int argc, char *argv[])
 				fprintf(stderr, "finished %s %d\n", __FILE__, __LINE__);
 				loop = 0;
 			}
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
 		fprintf(stderr, "aepd_interface_result %s %d\n", __FILE__, __LINE__);
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (first) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			first = 0;
 			for (n = 0; n < aepd_interface->chans + aepd_interface->vchans; n++)
 				printf("# %s\t%s\t%s\t%s\t%s\n",
@@ -375,31 +369,24 @@ int main(int argc, char *argv[])
 					aepd_interface->colour[n],
 					aepd_interface->class[n]);
 
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			printf("#\n#\ntime ");
 			for (n = 0; n < aepd_interface->chans; n++) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				if (just_power) {
-					fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 					printf(" %s(W)", aepd_interface->channel_name_pretty[n]);
 				}
 				else {
-					fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 					printf(" %s(V) %s(A) %s(W)",
 						aepd_interface->channel_name_pretty[n],
 						aepd_interface->channel_name_pretty[n],
 						aepd_interface->channel_name_pretty[n]);
 				}
 			}
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			printf("\n");
 		}
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		periodic++;
 		fprintf(stderr, "periodic %d %s %d\n", periodic, __FILE__, __LINE__);
 		if ((periodic & 0x1ff) == 0) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			if (aepd_interface_result->triggered)
 				fprintf(stderr, "TRIGD ");
 			else
@@ -439,7 +426,6 @@ int main(int argc, char *argv[])
 			m++;
 
 			if (periodic & 0x1ff) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				continue;
 			}
 			if (just_power) {
diff --git a/libarmep/service.c b/libarmep/service.c
index fe8ace2..e695eef 100644
--- a/libarmep/service.c
+++ b/libarmep/service.c
@@ -415,17 +415,14 @@ post_start:
 	fprintf(stderr, "somebody had something for us %s %d\n", __FILE__, __LINE__);
 
 	for (m = 0; m <= aep_context->highest; m++) {
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		aep = &aep_context->aeps[m];
 
 		if (aep->fd < 1) {
-			//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
 
 		/* check for timeout */
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (tv.tv_sec > aep->sec_last_traffic + 2)
 			if (aep->done_config != 3 || aep->started) {
 				fprintf(stderr, "%s: timeout\n", aep->dev_filepath);
@@ -435,7 +432,6 @@ post_start:
 		if (aep->fd != fd_with_rx)
 			continue;
 
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (aep_context->verbose)
 			fprintf(stderr,"stuff for %d\n", m);
 
@@ -443,66 +439,53 @@ post_start:
 
 		/* work out how much of the ring we can fill */
 
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (aep->head <= aep->tail) {
 			budget = (aep->head - 1) + (sizeof(aep->ring) - aep->tail);
 			p = aep->ring + aep->tail;
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			if (!budget) {
-				//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				continue;
 			}
 
 			len = read(aep->fd, buf, budget);
-			//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			if (len <= 0) {
 				fprintf(stderr, "failed to read data\n");
 				goto died;
 			}
 
 			if (aep_context->verbose) {
-				//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				fprintf(stderr, "%d (a) fetched %d (budget %d)  head=%d tail=%d\n", m, len, budget, aep->head, aep->tail);
 			}
 
 			n = sizeof(aep->ring) - aep->tail;
 			if (len < n) {
-				//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				n = len;
 			}
 
 			memcpy(p, buf, n);
-			//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			aep->tail += n;
 			if (aep->tail == sizeof(aep->ring)) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				aep->tail = 0;
 			}
 
-			//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			len -= n;
 			if (len) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				memcpy(aep->ring, &buf[n], len);
 				aep->tail += len;
 			}
 
 		} else {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			budget = aep->head - aep->tail - 1;
 			p = aep->ring + aep->tail;
 			if (!budget)
 				continue;
 
 			len = read(aep->fd, p, budget);
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			if (len <= 0) {
 				fprintf(stderr, "failed to read data\n");
 				goto died;
 			}
 
 			if (aep_context->verbose) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				fprintf(stderr, "%d (b) fetched %d (budget %d) head=%d tail=%d\n", m, len, budget, aep->head, aep->tail);
 			}
 
@@ -510,11 +493,9 @@ post_start:
 		}
 
 		if (aep->tail == sizeof(aep->ring)) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			aep->tail = 0;
 		}
 
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		continue;
 
 died:
@@ -538,36 +519,27 @@ service:
 	 * otherwise other probes will drop data
 	 */
 
-	//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 	for (n = 0; n <= aep_context->highest; n++) {
 
 		aep = &aep_context->aeps[n];
 
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (aep->fd <= 0)
 			continue;
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		m = aep_protocol_parser(aep, MAX_BYTES_PER_AEP_SERVICE);  // needs debug
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (m >= 0) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
 		if (m < -1) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			n = aep_context->highest + 1;
 			continue;
 		}
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (!aep_context->verbose) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
 		fprintf(stderr, "service failed\n");
 		for (i = 0; i < CHANNELS_PER_PROBE; i++) {
 			if (!aep->ch[i].requested) {
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 				continue;
 			}
 			aep_context->awaiting_capture &= ~(1 << (n * 3 + i));
@@ -578,10 +550,8 @@ service:
 		aep->fd = 0;
 	}
 
-	//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 	if (aep_context->scans > (5 * MAX_PROBES) &&
 			aep_context->awaiting_capture == 0 && aep_context->exit_after_capture) {
-		//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		fprintf(stderr, "done all capture\n");
 		aep_context->aepd_interface->finished = 1;
 		return -1;
@@ -590,22 +560,16 @@ service:
 	/* if nothing waiting fail immediately if anything has buffered data to service */
 
 	aep_context->poll_timeout_ms = 10;
-	//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 	for (n = 0; n <= aep_context->highest; n++) {
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (aep_context->aeps[n].fd <= 0) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
 
-		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (aep_context->aeps[n].head != aep_context->aeps[n].tail) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			aep_context->poll_timeout_ms = 0;
 		}
 	}
 
-	//fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 	return 0;
 }