FreeCalypso > hg > freecalypso-tools

changeset 964:a96cb97b66a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b515a97e5dff
children 2969032bdfac
files ringtools/imy/main.c
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ringtools/imy/main.c	Mon Aug 28 03:52:53 2023 +0000
+++ b/ringtools/imy/main.c	Thu Aug 31 19:38:18 2023 +0000
@@ -9,7 +9,6 @@
 char *imy_filename;
 char melody_str_buf[MELODY_BUF_SIZE];
 unsigned beats_per_min = 120;
-unsigned tdma_durations[6][4];
 FILE *outF;
 
 main(argc, argv)