From 7f816029abf89cfff24876ca09b295882cd1aebc Mon Sep 17 00:00:00 2001 From: derselbst Date: Fri, 10 Jan 2020 17:07:58 +0100 Subject: [PATCH] Fix a few integer truncation warnings --- src/drivers/fluid_portaudio.c | 4 ++-- src/midi/fluid_midi.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/drivers/fluid_portaudio.c b/src/drivers/fluid_portaudio.c index 342c0f69..49ab948b 100644 --- a/src/drivers/fluid_portaudio.c +++ b/src/drivers/fluid_portaudio.c @@ -93,7 +93,7 @@ static int fluid_portaudio_get_device_name(int device_num, char **name_ptr) device_index:host_api_name:host_device_name. */ int i = device_num; - int size = 0; + size_t size = 0; do { @@ -103,7 +103,7 @@ static int fluid_portaudio_get_device_name(int device_num, char **name_ptr) while(i); /* index size */ /* host API size + host device size + 2 separators + zero termination */ - size += strlen(hostInfo->name) + strlen(deviceInfo->name) + 3; + size += FLUID_STRLEN(hostInfo->name) + FLUID_STRLEN(deviceInfo->name) + 3u; *name_ptr = FLUID_MALLOC(size); if(*name_ptr) diff --git a/src/midi/fluid_midi.c b/src/midi/fluid_midi.c index 7c5f567d..8c5c1d50 100644 --- a/src/midi/fluid_midi.c +++ b/src/midi/fluid_midi.c @@ -406,8 +406,7 @@ fluid_isasciistring(char *s) /* From ctype.h */ #define fluid_isascii(c) (((c) & ~0x7f) == 0) - int i; - int len = (int) FLUID_STRLEN(s); + size_t i, len = FLUID_STRLEN(s); for(i = 0; i < len; i++) { @@ -1457,7 +1456,7 @@ delete_fluid_track(fluid_track_t *track) int fluid_track_set_name(fluid_track_t *track, char *name) { - int len; + size_t len; if(track->name != NULL) {