FreeCalypso > hg > freecalypso-tools
view loadtools/tpinterfb.c @ 964:a96cb97b66a2
ringtools/imy: fix duplicate definition of tdma_durations[]
The bug was reported by Vadim Yanitskiy <fixeria@osmocom.org>,
although the present fix is slightly different from the contributed
patch: because main.c doesn't need this tdma_durations[] array
at all, let's simply remove the reference to this array from main.c
rather than turn it into an extern.
I no longer remember my original thought flow that resulted (by mistake)
in tdma_durations[] being multiply defined in main.c and durations.c.
My intent might have been to define all globals in main.c and have
the reference in durations.c be an extern - and I missed that extern -
but without clear memory, I have no certainty. In any case, having
this data array defined in the same module that fills it (durations.c)
is sensible, so let's make it the new way.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 31 Aug 2023 19:38:18 +0000 |
parents | 8d7dcfd9df53 |
children |
line wrap: on
line source
/* * This module contains functions for binary (as opposed to our usual ASCII) * interfacing to loadagent. */ #include <sys/types.h> #include <sys/time.h> #include <sys/errno.h> #include <stdio.h> #include <string.h> #include <strings.h> #include <stdlib.h> #include <unistd.h> extern int errno; extern int target_fd; collect_binblock_from_target(buf, expect_len, timeout) u_char *buf; unsigned expect_len; { fd_set fds; struct timeval tv; unsigned rcvd; int cc; for (rcvd = 0; rcvd < expect_len; ) { FD_ZERO(&fds); FD_SET(target_fd, &fds); tv.tv_sec = timeout; tv.tv_usec = 0; cc = select(target_fd+1, &fds, NULL, NULL, &tv); if (cc < 0) { if (errno == EINTR) continue; perror("select"); return(-1); } if (cc < 1) { fprintf(stderr, "error: timeout waiting for binary block\n"); return(-1); } cc = read(target_fd, buf + rcvd, expect_len - rcvd); if (cc <= 0) { perror("read after successful select"); return(-1); } rcvd += cc; } return(0); }