Fix invalid format string

[Version] 0.1.2
[Issue Type] Build

Change-Id: Ib469e12d1d1324e4a1bcbaa51afce9f42b7f1b88

diff --git a/packaging/audio-hal-bcm2837.spec b/packaging/audio-hal-bcm2837.spec
index c6090e490a222e0f80594b7767a3c6e84472316d..5f1dfede4ee44ef32dea74f942d30421d70d859b 100644 (file)
--- 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.1
+Version:    0.1.2
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/tizen-audio-impl-pcm.c b/tizen-audio-impl-pcm.c
index 6628e4eab557442e45b0b0a4f8447167e50373e1..dc93a90809baa3dcd635d32409bd81d7e3cc6919 100644 (file)
--- a/tizen-audio-impl-pcm.c
+++ b/tizen-audio-impl-pcm.c
@@ -223,7 +223,8 @@ audio_return_t _pcm_start(void *pcm_handle)
         return AUDIO_ERR_RESOURCE;
     }
 #endif
-       AUDIO_LOG_INFO("PCM handle %p start", pcm_handle);
+
+    AUDIO_LOG_INFO("PCM handle %p start", pcm_handle);
     return AUDIO_RET_OK;
 }
 
@@ -243,14 +244,15 @@ audio_return_t _pcm_stop(void *pcm_handle)
     }
 #endif
 
-       AUDIO_LOG_INFO("PCM handle %p stop", pcm_handle);
+    AUDIO_LOG_INFO("PCM handle %p stop", pcm_handle);
     return AUDIO_RET_OK;
 }
 
 audio_return_t _pcm_close(void *pcm_handle)
 {
     int err;
-       AUDIO_LOG_INFO("Try to close PCM handle %p", pcm_handle);
+
+    AUDIO_LOG_INFO("Try to close PCM handle %p", pcm_handle);
 
 #ifdef __USE_TINYALSA__
     if ((err = pcm_close(pcm_handle)) < 0) {
@@ -276,7 +278,7 @@ audio_return_t _pcm_avail(void *pcm_handle, uint32_t *avail)
 
     err = pcm_get_htimestamp(pcm_handle, &frames_avail, &tspec);
     if (err < 0) {
-        AUDIO_LOG_ERROR("Could not get avail and timespec at PCM handle 0x%x : %d", pcm_handle, err);
+        AUDIO_LOG_ERROR("Could not get avail and timespec at PCM handle %p : %d", pcm_handle, err);
         return AUDIO_ERR_IOCTL;
     }
 
@@ -289,7 +291,7 @@ audio_return_t _pcm_avail(void *pcm_handle, uint32_t *avail)
     snd_pcm_sframes_t frames_avail;
 
     if ((frames_avail = snd_pcm_avail(pcm_handle)) < 0) {
-               AUDIO_LOG_ERROR("Could not get avail at PCM handle %p: %d", pcm_handle, (int)frames_avail);
+        AUDIO_LOG_ERROR("Could not get avail at PCM handle %p : %ld", pcm_handle, frames_avail);
         return AUDIO_ERR_IOCTL;
     }
 
@@ -324,7 +326,7 @@ audio_return_t _pcm_write(void *pcm_handle, const void *buffer, uint32_t frames)
 
     frames_written = snd_pcm_writei(pcm_handle, buffer, (snd_pcm_uframes_t) frames);
     if (frames_written < 0) {
-               AUDIO_LOG_ERROR("Failed to write pcm : %d", (int)frames_written);
+        AUDIO_LOG_ERROR("Failed to write pcm : %ld", frames_written);
         return AUDIO_ERR_IOCTL;
     }
 
@@ -355,7 +357,7 @@ audio_return_t _pcm_read(void *pcm_handle, void *buffer, uint32_t frames)
 
     frames_read = snd_pcm_readi(pcm_handle, buffer, (snd_pcm_uframes_t)frames);
     if (frames_read < 0) {
-               AUDIO_LOG_ERROR("Failed to read pcm : %d", (int)frames_read);
+        AUDIO_LOG_ERROR("Failed to read pcm : %ld", frames_read);
         return AUDIO_ERR_IOCTL;
     }
 
@@ -481,7 +483,8 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp
     _stop_threshold    = config->stop_threshold;
     _silence_threshold = config->silence_threshold;
 
-    AUDIO_LOG_DEBUG("_pcm_get_params (handle 0x%x, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, config->format, config->rate, config->channels, config->period_size, config->period_count, _buffer_size);
+    AUDIO_LOG_DEBUG("_pcm_get_params (handle %p, format %d, rate %u, channels %u, period_size %u, periods %u, buffer_size %u)",
+                    pcm_handle, config->format, config->rate, config->channels, config->period_size, config->period_count, _buffer_size);
 #else  /* alsa-lib */
     int err;
     audio_pcm_sample_spec_t *ss;
@@ -510,7 +513,7 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp
         (err = snd_pcm_hw_params_get_format(hwparams, &_format)) < 0 ||
         (err = snd_pcm_hw_params_get_rate(hwparams, &_rate, &dir)) < 0 ||
         (err = snd_pcm_hw_params_get_channels(hwparams, &_channels)) < 0) {
-               AUDIO_LOG_ERROR("snd_pcm_hw_params_get_{period_size|buffer_size|periods|format|rate|channels}() failed : %d", err);
+        AUDIO_LOG_ERROR("snd_pcm_hw_params_get_{period_size|buffer_size|periods|format|rate|channels}() failed : %d", err);
         return AUDIO_ERR_PARAMETER;
     }
 
@@ -529,10 +532,11 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp
         (err = snd_pcm_sw_params_get_stop_threshold(swparams, &_stop_threshold)) < 0  ||
         (err = snd_pcm_sw_params_get_silence_threshold(swparams, &_silence_threshold)) < 0  ||
         (err = snd_pcm_sw_params_get_avail_min(swparams, &_avail_min)) < 0) {
-       AUDIO_LOG_ERROR("snd_pcm_sw_params_get_{start_threshold|stop_threshold|silence_threshold|avail_min}() failed : %d", err);
+        AUDIO_LOG_ERROR("snd_pcm_sw_params_get_{start_threshold|stop_threshold|silence_threshold|avail_min}() failed : %d", err);
     }
 
-       AUDIO_LOG_DEBUG("_pcm_get_params (handle %p, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, _format, _rate, _channels, (int)_period_size, _periods, (int)_buffer_size);
+    AUDIO_LOG_DEBUG("_pcm_get_params (handle %p, format %d, rate %u, channels %u, period_size %lu, periods %u, buffer_size %lu)",
+                    pcm_handle, _format, _rate, _channels, _period_size, _periods, _buffer_size);
 #endif
 
     return AUDIO_RET_OK;
@@ -599,7 +603,7 @@ audio_return_t _pcm_set_params(void *pcm_handle, uint32_t direction, void *sampl
 
     _buffer_size = period_size * periods;
     if ((err = snd_pcm_hw_params_set_buffer_size(pcm_handle, hwparams, _buffer_size)) < 0) {
-        AUDIO_LOG_ERROR("snd_pcm_hw_params_set_buffer_size(%u) failed : %d", _buffer_size, err);
+        AUDIO_LOG_ERROR("snd_pcm_hw_params_set_buffer_size(%lu) failed : %d", _buffer_size, err);
         return AUDIO_ERR_PARAMETER;
     }
 
@@ -645,7 +649,8 @@ audio_return_t _pcm_set_params(void *pcm_handle, uint32_t direction, void *sampl
         return AUDIO_ERR_IOCTL;
     }
 
-       AUDIO_LOG_DEBUG("_pcm_set_params (handle %p, format %d, rate %d, channels %d, period_size %d, periods     %d, buffer_size %d)", pcm_handle, ss.format, ss.rate, ss.channels, period_size, periods,(int) _buffer_size);
+    AUDIO_LOG_DEBUG("_pcm_set_params (handle %p, format %d, rate %u, channels %u, period_size %u, periods %u, buffer_size %lu)",
+                    pcm_handle, ss.format, ss.rate, ss.channels, period_size, periods, _buffer_size);
 #endif
 
     return AUDIO_RET_OK;

diff --git a/tizen-audio-pcm.c b/tizen-audio-pcm.c
index b18ad7ef86c06e6dadfe940ccf7b9701a05ef20b..c12c196541ce9a27825f52eace9ac58fef41ee0e 100644 (file)
--- a/tizen-audio-pcm.c
+++ b/tizen-audio-pcm.c
@@ -62,7 +62,7 @@ audio_return_t audio_pcm_open(void *audio_handle, const char *card, const char *
 
     ah = (audio_hal_t*)audio_handle;
     ah->device.pcm_count++;
-    AUDIO_LOG_INFO("Opening PCM handle 0x%x", (unsigned int)*pcm_handle);
+    AUDIO_LOG_INFO("Opening PCM handle %p", *pcm_handle);
 
     return AUDIO_RET_OK;
 }