FreeCalypso > hg > freecalypso-tools
view target-utils/libtiffs/rdinmem.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 | 9214118ae941 |
children |
line wrap: on
line source
#include <sys/types.h> #include "types.h" #include "struct.h" #include "globals.h" #include "macros.h" tiffs_read_into_ram(pathname, buf, maxlen, lenrtn) char *pathname; u8 *buf; size_t maxlen, *lenrtn; { int stat, cont; u8 *chunk_start; size_t chunk_size, real_len, roomleft; stat = tiffs_find_file(pathname, &chunk_start, &chunk_size, &cont); if (stat < 0) return(stat); if (chunk_size > maxlen) { toobig: printf("Error: %s is bigger than the read buffer\n", pathname); return(-1); } real_len = chunk_size; memcpy(buf, chunk_start, chunk_size); buf += chunk_size; roomleft = maxlen - chunk_size; while (cont) { stat = tiffs_get_segment(cont, &chunk_start, &chunk_size, &cont); if (stat < 0) return(stat); if (chunk_size > roomleft) goto toobig; real_len += chunk_size; memcpy(buf, chunk_start, chunk_size); buf += chunk_size; roomleft -= chunk_size; } if (lenrtn) *lenrtn = real_len; return(0); }