zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-04 01:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fluid_compare_func_t const correctness (#858)

Browse source 
fluid_compare_func_t should receive const args.
This commit is contained in:
Tom M 2021-04-25 13:44:40 +02:00 committed by GitHub
parent 883ea24960
commit 00806600b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfloader/fluid_sffile.c
View file

@ -243,7 +243,7 @@ static int load_shdr(SFData *sf, unsigned int size);
static int chunkid(uint32_t id); static int chunkid(uint32_t id);
static int read_listchunk(SFData *sf, SFChunk *chunk); static int read_listchunk(SFData *sf, SFChunk *chunk);
static int pdtahelper(SFData *sf, unsigned int expid, unsigned int reclen, SFChunk *chunk, int *size); static int pdtahelper(SFData *sf, unsigned int expid, unsigned int reclen, SFChunk *chunk, int *size);
static int preset_compare_func(void *a, void *b); static int preset_compare_func(const void *a, const void *b);
static fluid_list_t *find_gen_by_id(int gen, fluid_list_t *genlist); static fluid_list_t *find_gen_by_id(int gen, fluid_list_t *genlist);
static int valid_inst_genid(unsigned short genid); static int valid_inst_genid(unsigned short genid);
static int valid_preset_genid(unsigned short genid); static int valid_preset_genid(unsigned short genid);
@ -623,7 +623,7 @@ static int load_body(SFData *sf)
} }
/* sort preset list by bank, preset # */ /* sort preset list by bank, preset # */
sf->preset = fluid_list_sort(sf->preset, (fluid_compare_func_t)preset_compare_func); sf->preset = fluid_list_sort(sf->preset, preset_compare_func);
return TRUE; return TRUE;
} }
@ -2120,12 +2120,12 @@ void delete_zone(SFZone *zone)
} }
/* preset sort function, first by bank, then by preset # */ /* preset sort function, first by bank, then by preset # */
static int preset_compare_func(void *a, void *b) static int preset_compare_func(const void *a, const void *b)
{ {
int aval, bval; int aval, bval;
aval = (int)(((SFPreset *)a)->bank) << 16 | ((SFPreset *)a)->prenum; aval = (int)(((const SFPreset *)a)->bank) << 16 | ((const SFPreset *)a)->prenum;
bval = (int)(((SFPreset *)b)->bank) << 16 | ((SFPreset *)b)->prenum; bval = (int)(((const SFPreset *)b)->bank) << 16 | ((const SFPreset *)b)->prenum;
return (aval - bval); return (aval - bval);
} }

4
src/utils/fluid_list.c
View file

@ -300,11 +300,11 @@ fluid_list_t *fluid_list_insert_at(fluid_list_t *list, int n, void *data)
/* Compare function to sort strings alphabetically, /* Compare function to sort strings alphabetically,
* for use with fluid_list_sort(). */ * for use with fluid_list_sort(). */
int int
fluid_list_str_compare_func(void *a, void *b) fluid_list_str_compare_func(const void *a, const void *b)
{ {
if(a && b) if(a && b)
{ {
return FLUID_STRCMP((char *)a, (char *)b); return FLUID_STRCMP(a, b);
} }
if(!a && !b) if(!a && !b)

4
src/utils/fluid_list.h
View file

@ -33,7 +33,7 @@
typedef struct _fluid_list_t fluid_list_t; typedef struct _fluid_list_t fluid_list_t;
typedef int (*fluid_compare_func_t)(void *a, void *b); typedef int (*fluid_compare_func_t)(const void *a, const void *b);
struct _fluid_list_t struct _fluid_list_t
{ {
@ -58,6 +58,6 @@ int fluid_list_size(fluid_list_t *list);
#define fluid_list_next(slist) ((slist) ? (((fluid_list_t *)(slist))->next) : NULL) #define fluid_list_next(slist) ((slist) ? (((fluid_list_t *)(slist))->next) : NULL)
#define fluid_list_get(slist) ((slist) ? ((slist)->data) : NULL) #define fluid_list_get(slist) ((slist) ? ((slist)->data) : NULL)
int fluid_list_str_compare_func(void *a, void *b); int fluid_list_str_compare_func(const void *a, const void *b);
#endif /* _FLUID_LIST_H */ #endif /* _FLUID_LIST_H */

6
test/dump_sfont.c
View file

@ -12,7 +12,7 @@ static void dump_preset(fluid_preset_t *preset);
static void dump_inst_zone(fluid_inst_zone_t *zone); static void dump_inst_zone(fluid_inst_zone_t *zone);
static void dump_inst(fluid_inst_t *inst); static void dump_inst(fluid_inst_t *inst);
static void dump_defsfont(fluid_defsfont_t *defsfont); static void dump_defsfont(fluid_defsfont_t *defsfont);
static int inst_compare_func(void *a, void *b); static int inst_compare_func(const void *a, const void *b);
static fluid_list_t *collect_preset_insts(fluid_preset_t *preset, fluid_list_t *inst_list); static fluid_list_t *collect_preset_insts(fluid_preset_t *preset, fluid_list_t *inst_list);
#define FMT_BUFSIZE (4096) #define FMT_BUFSIZE (4096)
@ -288,7 +288,7 @@ static void dump_inst(fluid_inst_t *inst)
} }
} }
static int inst_compare_func(void *a, void *b) static int inst_compare_func(const void *a, const void *b)
{ {
const fluid_inst_t *inst_a = a; const fluid_inst_t *inst_a = a;
const fluid_inst_t *inst_b = b; const fluid_inst_t *inst_b = b;
@ -355,7 +355,7 @@ static void dump_defsfont(fluid_defsfont_t *defsfont)
inst_list = collect_preset_insts(preset, inst_list); inst_list = collect_preset_insts(preset, inst_list);
} }
inst_list = fluid_list_sort(inst_list, (fluid_compare_func_t)inst_compare_func); inst_list = fluid_list_sort(inst_list, inst_compare_func);
fmt("instruments:"); fmt("instruments:");
for (list = inst_list; list; list = fluid_list_next(list)) for (list = inst_list; list; list = fluid_list_next(list))