From 79af9a9d023abd3a6ad140b377380b029ec3772e Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Fri, 14 Dec 2018 15:53:52 +0900 Subject: Fix invalid format string [Version] 0.1.13 [Issue Type] Build Change-Id: I4a22a78b27dfe5f344c6b5b2ffa16ffe5e066f64 --- packaging/audio-hal-wm1831.spec | 2 +- tizen-audio-impl-pcm.c | 29 ++++++++++++++++------------- tizen-audio-pcm.c | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packaging/audio-hal-wm1831.spec b/packaging/audio-hal-wm1831.spec index 987fe92..f9cdb6c 100644 --- a/packaging/audio-hal-wm1831.spec +++ b/packaging/audio-hal-wm1831.spec @@ -1,6 +1,6 @@ Name: audio-hal-wm1831 Summary: TIZEN Audio HAL for WM1831 -Version: 0.1.12 +Version: 0.1.13 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/tizen-audio-impl-pcm.c b/tizen-audio-impl-pcm.c index fc40c28..0e6ad59 100644 --- a/tizen-audio-impl-pcm.c +++ b/tizen-audio-impl-pcm.c @@ -222,7 +222,7 @@ audio_return_t _pcm_start(void *pcm_handle) } #endif - AUDIO_LOG_INFO("PCM handle 0x%x start", pcm_handle); + AUDIO_LOG_INFO("PCM handle %p start", pcm_handle); return AUDIO_RET_OK; } @@ -242,7 +242,7 @@ audio_return_t _pcm_stop(void *pcm_handle) } #endif - AUDIO_LOG_INFO("PCM handle 0x%x stop", pcm_handle); + AUDIO_LOG_INFO("PCM handle %p stop", pcm_handle); return AUDIO_RET_OK; } @@ -250,7 +250,7 @@ audio_return_t _pcm_close(void *pcm_handle) { int err; - AUDIO_LOG_INFO("Try to close PCM handle 0x%x", 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 +276,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 +289,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 0x%x : %d", pcm_handle, frames_avail); + AUDIO_LOG_ERROR("Could not get avail at PCM handle %p : %ld", pcm_handle, frames_avail); return AUDIO_ERR_IOCTL; } @@ -324,7 +324,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", frames_written); + AUDIO_LOG_ERROR("Failed to write pcm : %ld", frames_written); return AUDIO_ERR_IOCTL; } @@ -355,7 +355,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", frames_read); + AUDIO_LOG_ERROR("Failed to read pcm : %ld", frames_read); return AUDIO_ERR_IOCTL; } @@ -481,7 +481,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 +511,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 : %s", 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 +530,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 : %s", 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 0x%x, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, _format, _rate, _channels, _period_size, _periods, _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 +601,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 +647,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 0x%x, 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, _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 b18ad7e..c12c196 100644 --- 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; } -- cgit v1.2.3