Fix SVACE defects

Change-Id: I8c1cb7e3b19d55ef0742ba680d4616627346fba5

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 9638f7471720860883542cf0e9b4b12a79974e04..10b68250171da5e8831000f8d6fd89ba21eac24d 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          5.0.23
+Version:          5.0.24
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/hal-manager.c b/src/hal-manager.c
index 586639950210445e6dde9772552fd5061a0fcf22..64888d8d312ee6cd1baafdeb8ee2a1b920f73992 100644 (file)
--- a/src/hal-manager.c
+++ b/src/hal-manager.c
@@ -216,7 +216,7 @@ int32_t pa_hal_manager_get_volume_mute(pa_hal_manager *h, const char *volume_typ
     info.type = volume_type;
     info.direction = direction;
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.get_volume_mute(h->ah_handle, &info, mute))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.get_volume_mute(h->ah_handle, &info, mute)))) {
         pa_log_error("get_mute returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -234,7 +234,7 @@ int32_t pa_hal_manager_set_volume_mute(pa_hal_manager *h, const char *volume_typ
     info.type = volume_type;
     info.direction = direction;
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.set_volume_mute(h->ah_handle, &info, mute))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.set_volume_mute(h->ah_handle, &info, mute)))) {
         pa_log_error("set_mute returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -248,7 +248,7 @@ int32_t pa_hal_manager_do_route(pa_hal_manager *h, hal_route_info *info) {
     pa_assert(h);
     pa_assert(info);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.do_route(h->ah_handle, (audio_route_info_t*)info))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.do_route(h->ah_handle, (audio_route_info_t*)info)))) {
         pa_log_error("do_route returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -262,7 +262,7 @@ int32_t pa_hal_manager_update_route_option(pa_hal_manager *h, hal_route_option *
     pa_assert(h);
     pa_assert(option);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.update_route_option(h->ah_handle, (audio_route_option_t*)option))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.update_route_option(h->ah_handle, (audio_route_option_t*)option)))) {
         pa_log_error("update_route_option returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -281,7 +281,7 @@ int32_t pa_hal_manager_update_stream_connection_info(pa_hal_manager *h, hal_stre
     hal_info.direction = info->direction;
     hal_info.idx = info->idx;
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.update_stream_connection_info(h->ah_handle, &hal_info, (uint32_t)info->is_connected))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.update_stream_connection_info(h->ah_handle, &hal_info, (uint32_t)info->is_connected)))) {
         pa_log_error("update_stream_connection_info returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -299,8 +299,8 @@ int32_t pa_hal_manager_get_buffer_attribute(pa_hal_manager *h, hal_stream_info *
     pa_log_info("latency:%s, rate:%u, format:%d, channels:%u",
         info->latency, info->sample_spec->rate, info->sample_spec->format, info->sample_spec->channels);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.get_buffer_attr(h->ah_handle, info->direction, info->latency, info->sample_spec->rate, info->sample_spec->format,
-                                                         info->sample_spec->channels, maxlength, tlength, prebuf, minreq, fragsize))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.get_buffer_attr(h->ah_handle, info->direction, info->latency, info->sample_spec->rate, info->sample_spec->format,
+                                                         info->sample_spec->channels, maxlength, tlength, prebuf, minreq, fragsize)))) {
         pa_log_error("get_buffer_attr returns error:0x%x", hal_ret);
         ret = -1;
     } else
@@ -317,7 +317,7 @@ int32_t pa_hal_manager_pcm_open(pa_hal_manager *h, pcm_handle *pcm_h, io_directi
     pa_assert(pcm_h);
     pa_assert(sample_spec);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_open(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_open(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods)))) {
         pa_log_error("pcm_open returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -331,7 +331,7 @@ int32_t pa_hal_manager_pcm_start(pa_hal_manager *h, pcm_handle pcm_h) {
     pa_assert(h);
     pa_assert(pcm_h);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_start(h->ah_handle, pcm_h))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_start(h->ah_handle, pcm_h)))) {
         pa_log_error("pcm_start returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -345,7 +345,7 @@ int32_t pa_hal_manager_pcm_stop(pa_hal_manager *h, pcm_handle pcm_h) {
     pa_assert(h);
     pa_assert(pcm_h);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_stop(h->ah_handle, pcm_h))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_stop(h->ah_handle, pcm_h)))) {
         pa_log_error("pcm_stop returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -359,7 +359,7 @@ int32_t pa_hal_manager_pcm_close(pa_hal_manager *h, pcm_handle pcm_h) {
     pa_assert(h);
     pa_assert(pcm_h);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_close(h->ah_handle, pcm_h))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_close(h->ah_handle, pcm_h)))) {
         pa_log_error("pcm_close returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -374,7 +374,7 @@ int32_t pa_hal_manager_pcm_available(pa_hal_manager *h, pcm_handle pcm_h, uint32
     pa_assert(pcm_h);
     pa_assert(available);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_avail(h->ah_handle, pcm_h, available))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_avail(h->ah_handle, pcm_h, available)))) {
         pa_log_error("pcm_avail returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -389,7 +389,7 @@ int32_t pa_hal_manager_pcm_write(pa_hal_manager *h, pcm_handle pcm_h, const void
     pa_assert(pcm_h);
     pa_assert(buffer);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_write(h->ah_handle, pcm_h, buffer, frames))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_write(h->ah_handle, pcm_h, buffer, frames)))) {
         pa_log_error("pcm_write returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -404,7 +404,7 @@ int32_t pa_hal_manager_pcm_read(pa_hal_manager *h, pcm_handle pcm_h, void *buffe
     pa_assert(pcm_h);
     pa_assert(buffer);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_read(h->ah_handle, pcm_h, buffer, frames))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_read(h->ah_handle, pcm_h, buffer, frames)))) {
         pa_log_error("pcm_read returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -419,7 +419,7 @@ int32_t pa_hal_manager_pcm_get_fd(pa_hal_manager *h, pcm_handle pcm_h, int *fd)
     pa_assert(pcm_h);
     pa_assert(fd);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_get_fd(h->ah_handle, pcm_h, fd))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_get_fd(h->ah_handle, pcm_h, fd)))) {
         pa_log_error("pcm_get_fd returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -433,7 +433,7 @@ int32_t pa_hal_manager_pcm_recover(pa_hal_manager *h, pcm_handle pcm_h, int err)
     pa_assert(h);
     pa_assert(pcm_h);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_recover(h->ah_handle, pcm_h, err))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_recover(h->ah_handle, pcm_h, err)))) {
         pa_log_error("pcm_recover returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -449,7 +449,7 @@ int32_t pa_hal_manager_pcm_get_params(pa_hal_manager *h, pcm_handle pcm_h, uint3
     pa_assert(period_size);
     pa_assert(periods);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_get_params(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_get_params(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods)))) {
         pa_log_error("pcm_get_params returns error:0x%x", hal_ret);
         ret = -1;
     }
@@ -463,7 +463,7 @@ int32_t pa_hal_manager_pcm_set_params(pa_hal_manager *h, pcm_handle pcm_h, uint3
     pa_assert(h);
     pa_assert(sample_spec);
 
-    if (AUDIO_IS_ERROR(hal_ret = h->intf.pcm_set_params(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods))) {
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.pcm_set_params(h->ah_handle, pcm_h, direction, sample_spec, period_size, periods)))) {
         pa_log_error("pcm_set_params returns error:0x%x", hal_ret);
         ret = -1;
     }

diff --git a/src/module-sound-player.c b/src/module-sound-player.c
index 1e6f0a60289a275105569bb526cea5a83090f478..9341c8353ee76988b59f5cdbf56766978022391d 100644 (file)
--- a/src/module-sound-player.c
+++ b/src/module-sound-player.c
@@ -251,7 +251,7 @@ static int _sample_play(struct userdata *u, const char *sample_name, const char
     if (scache_idx != PA_IDXSET_INVALID) {
         pa_log_debug("pa_scache_play_item() start, scache idx[%u] for name[%s]", scache_idx, sample_name);
         /* for more precision, need to update volume value here */
-        if ((ret = pa_scache_play_item(u->module->core, sample_name, sink, PA_VOLUME_NORM, p, &stream_idx) < 0)) {
+        if ((ret = pa_scache_play_item(u->module->core, sample_name, sink, PA_VOLUME_NORM, p, &stream_idx)) < 0) {
             pa_log_error("pa_scache_play_item fail");
             goto exit;
         }