diff options
| author | Neil Williams <codehelp@debian.org> | 2017-05-24 12:59:00 +0100 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2017-05-24 12:59:00 +0100 |
| commit | ce106007f78e71bb9af357c75c1fb5fbecad9027 (patch) | |
| tree | e34da81d11da0cb650f0571ae80af6c62ab359d4 | |
| parent | 46f502f9c100fab4e57bfe20e89d6fa654ca68f0 (diff) | |
add more fprintf and bracketing
| -rw-r--r-- | arm-probe/arm-probe.c | 4 | ||||
| -rw-r--r-- | libarmep/aepd-interface.c | 10 | ||||
| -rw-r--r-- | libarmep/protocol.c | 16 | ||||
| -rw-r--r-- | libarmep/service.c | 6 |
4 files changed, 23 insertions, 13 deletions
diff --git a/arm-probe/arm-probe.c b/arm-probe/arm-probe.c index 3d48af1..82cf043 100644 --- a/arm-probe/arm-probe.c +++ b/arm-probe/arm-probe.c @@ -353,7 +353,7 @@ 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, "!aepd_interface_result %d %s %d\n", aepd_interface_result, __FILE__, __LINE__); + fprintf(stderr, "!aepd_interface_result %s %d\n", __FILE__, __LINE__); if (aepd_interface->finished) { fprintf(stderr, "finished %s %d\n", __FILE__, __LINE__); loop = 0; @@ -361,7 +361,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "%s %d\n", __FILE__, __LINE__); continue; } - fprintf(stderr, "aepd_interface_result %d %s %d\n", aepd_interface_result, __FILE__, __LINE__); + fprintf(stderr, "aepd_interface_result %s %d\n", __FILE__, __LINE__); fprintf(stderr, "%s %d\n", __FILE__, __LINE__); if (first) { diff --git a/libarmep/aepd-interface.c b/libarmep/aepd-interface.c index e78b308..3d634f7 100644 --- a/libarmep/aepd-interface.c +++ b/libarmep/aepd-interface.c @@ -81,12 +81,18 @@ struct aepd_interface_result * aep_wait_for_next_result(struct aepd_interface *a ts.tv_sec = tv.tv_sec + 2; ts.tv_nsec = 0; - if (sem_timedwait(aepd_interface->semaphore, &ts) < 0) + fprintf(stderr, "%s %d\n", __FILE__, __LINE__); + if (sem_timedwait(aepd_interface->semaphore, &ts) < 0) { + fprintf(stderr, "%s %d\n", __FILE__, __LINE__); return NULL; + } - if (aepd_interface->tail == aepd_interface->head) + if (aepd_interface->tail == aepd_interface->head) { + fprintf(stderr, "%s %d\n", __FILE__, __LINE__); return NULL; + } + fprintf(stderr, "%s %d\n", __FILE__, __LINE__); return &aepd_interface->aepd_interface_result[aepd_interface->tail]; } diff --git a/libarmep/protocol.c b/libarmep/protocol.c index ad05c64..dab18e8 100644 --- a/libarmep/protocol.c +++ b/libarmep/protocol.c @@ -235,15 +235,17 @@ int aep_protocol_parser(struct aep *aep, int samples) break; case APP_INIT_START_ACK: - if (v != 0xac) + if (v != 0xac) { return -1; + } - if (aep->aep_context->verbose) - fprintf(stderr, - "Start acknowledge seen " - "%s %s %08X %d\n", - aep->dev_filepath, aep->name, - aep->version, aep->rate); + if (aep->aep_context->verbose) { + fprintf(stderr, + "Start acknowledge seen " + "%s %s %08X %d\n", + aep->dev_filepath, aep->name, + aep->version, aep->rate); + } aep->done_config |= 4; aep->state = APP_FRAME_L; diff --git a/libarmep/service.c b/libarmep/service.c index e9f8c36..084af59 100644 --- a/libarmep/service.c +++ b/libarmep/service.c @@ -593,14 +593,16 @@ service: 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) + 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) + 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__); |