add more fprintf and bracketing

3 files changed, 36 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index d6e3338..c2b5caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ ar-lib
 *.o
 *.lo
 *.la
+arm-probe/arm-probe
diff --git a/arm-probe/arm-probe.c b/arm-probe/arm-probe.c
index 81b0afd..3d48af1 100644
--- a/arm-probe/arm-probe.c
+++ b/arm-probe/arm-probe.c
@@ -353,13 +353,15 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		aepd_interface_result = aep_wait_for_next_result(aepd_interface);
 		if (!aepd_interface_result) {
-			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
-			if (aepd_interface->finished)
-				fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
+			fprintf(stderr, "!aepd_interface_result %d %s %d\n", aepd_interface_result, __FILE__, __LINE__);
+			if (aepd_interface->finished) {
+				fprintf(stderr, "finished %s %d\n", __FILE__, __LINE__);
 				loop = 0;
-
+			}
+			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
 		}
+		fprintf(stderr, "aepd_interface_result %d %s %d\n", aepd_interface_result, __FILE__, __LINE__);
 
 		fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 		if (first) {
@@ -375,7 +377,7 @@ int main(int argc, char *argv[])
 
 			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			printf("#\n#\ntime ");
-			for (n = 0; n < aepd_interface->chans; n++)
+			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__);
@@ -388,6 +390,7 @@ int main(int argc, char *argv[])
 						aepd_interface->channel_name_pretty[n],
 						aepd_interface->channel_name_pretty[n]);
 				}
+			}
 			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			printf("\n");
 		}
diff --git a/libarmep/service.c b/libarmep/service.c
index 89ac1f5..e9f8c36 100644
--- a/libarmep/service.c
+++ b/libarmep/service.c
@@ -412,13 +412,16 @@ post_start:
 	gettimeofday(&tv, NULL);
 
 	/* somebody had something for us */
+	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)
+		if (aep->fd < 1) {
+			fprintf(stderr, "%s %d\n", __FILE__, __LINE__);
 			continue;
+		}
 
 		/* check for timeout */
 
@@ -444,8 +447,11 @@ post_start:
 		if (aep->head <= aep->tail) {
 			budget = (aep->head - 1) + (sizeof(aep->ring) - aep->tail);
 			p = aep->ring + aep->tail;
-			if (!budget)
+			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__);
@@ -454,21 +460,29 @@ post_start:
 				goto died;
 			}
 
-			if (aep_context->verbose)
+			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)
+			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))
+			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;
 			}
@@ -487,15 +501,20 @@ post_start:
 				goto died;
 			}
 
-			if (aep_context->verbose)
+			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);
+			}
 
 			aep->tail += len;
 		}
 
-		if (aep->tail == sizeof(aep->ring))
+		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:
@@ -562,6 +581,7 @@ service:
 	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;