FreeCalypso > hg > freecalypso-tools
view 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 |
line wrap: on
line source
/* * This file contains the top-level code for fc-imy2pwt. */ #include <stdio.h> #include <stdlib.h> #include "sizelimits.h" char *imy_filename; char melody_str_buf[MELODY_BUF_SIZE]; unsigned beats_per_min = 120; FILE *outF; main(argc, argv) char **argv; { if (argc < 2 || argc > 3) { fprintf(stderr, "usage: %s imy-file [outfile]\n", argv[0]); exit(1); } imy_filename = argv[1]; read_imy_firstpass(); compute_note_durations(); if (argc > 2) { outF = fopen(argv[2], "w"); if (!outF) { perror(argv[2]); exit(1); } } else outF = stdout; melody_convert_pass(); exit(0); }