Add more parameter check logic

[Version] 0.1.5
[Profile] Tv
[Issue Type] Code Enhancement

Change-Id: I0d68cfb7b6262301db9fbf6432b20d5a2646d024

diff --git a/packaging/audio-hal-hawkp.spec b/packaging/audio-hal-hawkp.spec
index 3e4a9ca..3262f11 100644 (file)
--- a/packaging/audio-hal-hawkp.spec
+++ b/packaging/audio-hal-hawkp.spec
@@ -1,6 +1,6 @@
 Name:       audio-hal-hawkp
 Summary:    TIZEN Audio HAL for Hawkp
-Version:    0.1.4
+Version:    0.1.5
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/tizen-audio-util.c b/tizen-audio-util.c
index 261f5cb..e480bd1 100644 (file)
--- a/tizen-audio-util.c
+++ b/tizen-audio-util.c
@@ -78,6 +78,8 @@ audio_return_t audio_mixer_control_get_value(audio_hal_t *ah, const char *ctl_na
     audio_return_t audio_ret = AUDIO_RET_OK;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(ctl_name, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(val, AUDIO_ERR_PARAMETER);
 
     audio_ret = _audio_mixer_control_get_value(ah, ALSA_DEFAULT_CARD, ctl_name, val);
     return audio_ret;
@@ -94,6 +96,9 @@ audio_return_t _audio_mixer_control_get_value(audio_hal_t *ah, const char *card,
     int ret = 0, count = 0, i = 0;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(card, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(ctl_name, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(val, AUDIO_ERR_PARAMETER);
 
     pthread_mutex_lock(&(ah->mixer.mutex));
 
@@ -175,6 +180,7 @@ audio_return_t _audio_mixer_control_set_value(audio_hal_t *ah, const char *card,
     int ret = 0, count = 0, i = 0;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(card, AUDIO_ERR_PARAMETER);
     AUDIO_RETURN_VAL_IF_FAIL(ctl_name, AUDIO_ERR_PARAMETER);
 
     pthread_mutex_lock(&(ah->mixer.mutex));

diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c
index e707b19..591c780 100644 (file)
--- a/tizen-audio-volume.c
+++ b/tizen-audio-volume.c
@@ -321,6 +321,8 @@ audio_return_t audio_get_volume_level_max(void *audio_handle, audio_volume_info_
     audio_volume_value_table_t *volume_value_table;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(info, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(level, AUDIO_ERR_PARAMETER);
     AUDIO_RETURN_VAL_IF_FAIL(ah->volume.volume_value_table, AUDIO_ERR_PARAMETER);
 
     /* Get max volume level by device & type */
@@ -337,6 +339,8 @@ audio_return_t audio_get_volume_level(void *audio_handle, audio_volume_info_t *i
     audio_hal_t *ah = (audio_hal_t *)audio_handle;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(info, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(level, AUDIO_ERR_PARAMETER);
 
     *level = ah->volume.volume_level[__get_volume_idx_by_string_type(info->type)];
 
@@ -352,6 +356,8 @@ audio_return_t audio_get_volume_value(void *audio_handle, audio_volume_info_t *i
     char dump_str[AUDIO_DUMP_STR_LEN] = {0,};
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(info, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(value, AUDIO_ERR_PARAMETER);
     AUDIO_RETURN_VAL_IF_FAIL(ah->volume.volume_value_table, AUDIO_ERR_PARAMETER);
 
     if (__is_only_mixer_ctl_volume_type(info->type)) {
@@ -379,6 +385,7 @@ audio_return_t audio_set_volume_level(void *audio_handle, audio_volume_info_t *i
     audio_hal_t *ah = (audio_hal_t *)audio_handle;
 
     AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER);
+    AUDIO_RETURN_VAL_IF_FAIL(info, AUDIO_ERR_PARAMETER);
 
     /* Update volume level */
     ah->volume.volume_level[__get_volume_idx_by_string_type(info->type)] = level;
@@ -387,7 +394,7 @@ audio_return_t audio_set_volume_level(void *audio_handle, audio_volume_info_t *i
     /* set mixer related to H/W volume if needed */
 
     if (__get_volume_idx_by_string_type(info->type) == AUDIO_VOLUME_TYPE_MASTER) {
-        if (_audio_mixer_control_set_value(ah, ALSA_CARD0, AMIXER_SPK_OUT_GAIN, level) != AUDIO_RET_OK) {
+        if ((audio_ret = _audio_mixer_control_set_value(ah, ALSA_CARD0, AMIXER_SPK_OUT_GAIN, level)) != AUDIO_RET_OK) {
             AUDIO_LOG_ERROR("set master volume with mixer failed");
         }
     }