zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-02 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove FLUID_STMT_[START|END]

Browse source 
for readability
This commit is contained in:
derselbst 2017-10-22 14:39:06 +02:00
parent 2deffc40c0
commit 3d7465a01e
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/sfloader/fluid_defsfont.c
View file

@ -2030,59 +2030,59 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
equivalent to the matching ID list in memory regardless of LE/BE machine equivalent to the matching ID list in memory regardless of LE/BE machine
*/ */
#define READCHUNK(var,fd) FLUID_STMT_START { \ #define READCHUNK(var,fd) do { \
if (!safe_fread(var, 8, fd)) \ if (!safe_fread(var, 8, fd)) \
return(FAIL); \ return(FAIL); \
((SFChunk *)(var))->size = GUINT32_FROM_LE(((SFChunk *)(var))->size); \ ((SFChunk *)(var))->size = GUINT32_FROM_LE(((SFChunk *)(var))->size); \
} FLUID_STMT_END } while(0)
#define READD(var,fd) FLUID_STMT_START { \ #define READD(var,fd) do { \
unsigned int _temp; \ unsigned int _temp; \
if (!safe_fread(&_temp, 4, fd)) \ if (!safe_fread(&_temp, 4, fd)) \
return(FAIL); \ return(FAIL); \
var = GINT32_FROM_LE(_temp); \ var = GINT32_FROM_LE(_temp); \
} FLUID_STMT_END } while(0)
#define READW(var,fd) FLUID_STMT_START { \ #define READW(var,fd) do { \
unsigned short _temp; \ unsigned short _temp; \
if (!safe_fread(&_temp, 2, fd)) \ if (!safe_fread(&_temp, 2, fd)) \
return(FAIL); \ return(FAIL); \
var = GINT16_FROM_LE(_temp); \ var = GINT16_FROM_LE(_temp); \
} FLUID_STMT_END } while(0)
#define READID(var,fd) FLUID_STMT_START { \ #define READID(var,fd) do { \
if (!safe_fread(var, 4, fd)) \ if (!safe_fread(var, 4, fd)) \
return(FAIL); \ return(FAIL); \
} FLUID_STMT_END } while(0)
#define READSTR(var,fd) FLUID_STMT_START { \ #define READSTR(var,fd) do { \
if (!safe_fread(var, 20, fd)) \ if (!safe_fread(var, 20, fd)) \
return(FAIL); \ return(FAIL); \
(*var)[20] = '\0'; \ (*var)[20] = '\0'; \
} FLUID_STMT_END } while(0)
#define READB(var,fd) FLUID_STMT_START { \ #define READB(var,fd) do { \
if (!safe_fread(&var, 1, fd)) \ if (!safe_fread(&var, 1, fd)) \
return(FAIL); \ return(FAIL); \
} FLUID_STMT_END } while(0)
#define FSKIP(size,fd) FLUID_STMT_START { \ #define FSKIP(size,fd) do { \
if (!safe_fseek(fd, size, SEEK_CUR)) \ if (!safe_fseek(fd, size, SEEK_CUR)) \
return(FAIL); \ return(FAIL); \
} FLUID_STMT_END } while(0)
#define FSKIPW(fd) FLUID_STMT_START { \ #define FSKIPW(fd) do { \
if (!safe_fseek(fd, 2, SEEK_CUR)) \ if (!safe_fseek(fd, 2, SEEK_CUR)) \
return(FAIL); \ return(FAIL); \
} FLUID_STMT_END } while(0)
/* removes and advances a fluid_list_t pointer */ /* removes and advances a fluid_list_t pointer */
#define SLADVREM(list, item) FLUID_STMT_START { \ #define SLADVREM(list, item) do { \
fluid_list_t *_temp = item; \ fluid_list_t *_temp = item; \
item = fluid_list_next(item); \ item = fluid_list_next(item); \
list = fluid_list_remove_link(list, _temp); \ list = fluid_list_remove_link(list, _temp); \
delete1_fluid_list(_temp); \ delete1_fluid_list(_temp); \
} FLUID_STMT_END } while(0)
static int chunkid (unsigned int id); static int chunkid (unsigned int id);
static int load_body (unsigned int size, SFData * sf, FILE * fd); static int load_body (unsigned int size, SFData * sf, FILE * fd);

4
src/utils/fluid_sys.h
View file

@ -65,10 +65,6 @@ void fluid_time_config(void);
#define FLUID_INT_TO_POINTER GINT_TO_POINTER #define FLUID_INT_TO_POINTER GINT_TO_POINTER
#define FLUID_N_ELEMENTS(struct) (sizeof (struct) / sizeof (struct[0])) #define FLUID_N_ELEMENTS(struct) (sizeof (struct) / sizeof (struct[0]))
/* Open/closes statement block */
#define FLUID_STMT_START do
#define FLUID_STMT_END while (0)
#define FLUID_IS_BIG_ENDIAN (G_BYTE_ORDER == G_BIG_ENDIAN) #define FLUID_IS_BIG_ENDIAN (G_BYTE_ORDER == G_BIG_ENDIAN)
/* /*