FreeCalypso > hg > freecalypso-tools
comparison ringtools/imy/main.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 | fd4c9bc7835d |
children |
comparison
equal
deleted
inserted
replaced
963:b515a97e5dff | 964:a96cb97b66a2 |
---|---|
7 #include "sizelimits.h" | 7 #include "sizelimits.h" |
8 | 8 |
9 char *imy_filename; | 9 char *imy_filename; |
10 char melody_str_buf[MELODY_BUF_SIZE]; | 10 char melody_str_buf[MELODY_BUF_SIZE]; |
11 unsigned beats_per_min = 120; | 11 unsigned beats_per_min = 120; |
12 unsigned tdma_durations[6][4]; | |
13 FILE *outF; | 12 FILE *outF; |
14 | 13 |
15 main(argc, argv) | 14 main(argc, argv) |
16 char **argv; | 15 char **argv; |
17 { | 16 { |