From e94237d37a8094cb8257df5034dea2ed8f57b64d Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Thu, 4 Feb 2021 12:29:40 +0900 Subject: [PATCH] Fix build warnings [Version] 0.1.10 [Issue Type] Build Change-Id: If0745cdad5ab09b0bae67d98e522c5ee91cd35e8 Signed-off-by: Jaechul Lee --- hal-backend-audio.c | 6 ++++-- packaging/audio-hal-bcm2837.spec | 2 +- tizen-audio-volume.c | 22 ++++++++++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/hal-backend-audio.c b/hal-backend-audio.c index 5b4c181..1a14d07 100644 --- a/hal-backend-audio.c +++ b/hal-backend-audio.c @@ -41,12 +41,14 @@ static int audio_rpi_init(void **data) return 0; } -static void audio_rpi_exit(void *data) +static int audio_rpi_exit(void *data) { if (!data) - return; + return -EINVAL; free(data); + + return 0; } hal_backend hal_backend_audio_data = { diff --git a/packaging/audio-hal-bcm2837.spec b/packaging/audio-hal-bcm2837.spec index 4b219ef..058ca89 100644 --- a/packaging/audio-hal-bcm2837.spec +++ b/packaging/audio-hal-bcm2837.spec @@ -1,6 +1,6 @@ Name: audio-hal-bcm2837 Summary: TIZEN Audio HAL for BCM2837 -Version: 0.1.9 +Version: 0.1.10 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c index 8025b5f..d22c842 100644 --- a/tizen-audio-volume.c +++ b/tizen-audio-volume.c @@ -182,6 +182,12 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_t *ah) uint32_t vol_type_idx, vol_level_idx, gain_type_idx; audio_volume_value_table_t *volume_value_table = ah->volume.volume_value_table; int size = 0; + const char delimiter[] = ", "; + const char *table_str = "volumes"; + const char *tmp_str = NULL; + const char *gain_str = NULL; + char *list_str = NULL, *ptr = NULL; + char *key, *token; if (access(VOLUME_INI_TEMP_PATH, F_OK) == 0) dict = iniparser_load(VOLUME_INI_TEMP_PATH); @@ -194,10 +200,6 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_t *ah) } } - const char delimiter[] = ", "; - char *key, *list_str, *token, *ptr = NULL; - const char *table_str = "volumes"; - /* Load volume table */ for (vol_type_idx = 0; vol_type_idx < AUDIO_VOLUME_TYPE_MAX; vol_type_idx++) { const char *vol_type_str = __get_volume_type_string_by_idx(vol_type_idx); @@ -207,7 +209,9 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_t *ah) key = malloc(size); if (key) { snprintf(key, size, "%s:%s", table_str, vol_type_str); - list_str = iniparser_getstring(dict, key, NULL); + if ((tmp_str = iniparser_getstring(dict, key, NULL))) + list_str = strdup(tmp_str); + if (list_str) { token = strtok_r(list_str, delimiter, &ptr); while (token) { @@ -218,6 +222,8 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_t *ah) volume_value_table->volume[vol_type_idx][ah->volume.volume_level_max[vol_type_idx]++] = vol_value; token = strtok_r(NULL, delimiter, &ptr); } + free(list_str); + list_str = NULL; } else { ah->volume.volume_level_max[vol_type_idx] = 1; for (vol_level_idx = 0; vol_level_idx < AUDIO_VOLUME_LEVEL_MAX; vol_level_idx++) { @@ -237,9 +243,9 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_t *ah) key = malloc(size); if (key) { snprintf(key, size, "%s:gain_%s", table_str, gain_type_str); - token = iniparser_getstring(dict, key, NULL); - if (token) { - volume_value_table->gain[gain_type_idx] = atof(token); + gain_str = iniparser_getstring(dict, key, NULL); + if (gain_str) { + volume_value_table->gain[gain_type_idx] = atof(gain_str); } else { volume_value_table->gain[gain_type_idx] = GAIN_VALUE_MAX; } -- 2.34.1