Fix invalid format string

[Version] 0.12.31
[Issue Type] Build

Change-Id: I17a4f2603d215e69864042c172c51d5c7db3c377

diff --git a/focus_server/mm_sound_mgr_focus_socket.c b/focus_server/mm_sound_mgr_focus_socket.c
index dabe22c..16a15ff 100644 (file)
--- a/focus_server/mm_sound_mgr_focus_socket.c
+++ b/focus_server/mm_sound_mgr_focus_socket.c
@@ -328,7 +328,7 @@ static void* work_thread_func(void *data)
                        if (need_to_exit(read_data.func_name))
                                goto LEAVE;
                } else {
-                       debug_error("failed to read(), read size mismatched, rval(%d), expect size(%d)",
+                       debug_error("failed to read(), read size mismatched, rval(%d), expect size(%zu)",
                                                rval, sizeof(_mm_sound_focus_socket_param_t));
                        goto LEAVE;
                }

diff --git a/mm_sound_pa_client.c b/mm_sound_pa_client.c
index 552026e..c060761 100644 (file)
--- a/mm_sound_pa_client.c
+++ b/mm_sound_pa_client.c
@@ -265,7 +265,7 @@ int mm_sound_pa_open(MMSoundHandleMode mode, int volume_config, pa_sample_spec *
                attr.tlength = (ss->rate / 10) * pa_sample_size(ss) * ss->channels;
                attr.maxlength = -1;
                attr.fragsize = 0;
-               debug_msg("rate(%d), samplesize(%d), ch(%d) format(%d)", ss->rate, pa_sample_size(ss), ss->channels, ss->format);
+               debug_msg("rate(%d), samplesize(%zu), ch(%d) format(%d)", ss->rate, pa_sample_size(ss), ss->channels, ss->format);
 
                debug_msg("prebuf(%d), minreq(%d), tlength(%d), maxlength(%d), fragsize(%d)", attr.prebuf, attr.minreq, attr.tlength,
                                  attr.maxlength, attr.fragsize);

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 757931d..d813e6c 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.12.30
+Version:    0.12.31
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/plugin/wav/mm_sound_plugin_codec_wave.c b/server/plugin/wav/mm_sound_plugin_codec_wave.c
index f3eea7f..afad62c 100644 (file)
--- a/server/plugin/wav/mm_sound_plugin_codec_wave.c
+++ b/server/plugin/wav/mm_sound_plugin_codec_wave.c
@@ -70,7 +70,7 @@ static int _sound_prepare(wave_info_t *h)
        h->spec.channels = h->si.channels;
        h->spec.format = PA_SAMPLE_S16LE;
 
-       debug_msg("SF_INFO : frames = %lld, samplerate = %d, channels = %d, format = 0x%X, sections = %d, seekable = %d",
+       debug_msg("SF_INFO : frames = %zu, samplerate = %d, channels = %d, format = 0x%X, sections = %d, seekable = %d",
                        h->si.frames, h->si.samplerate, h->si.channels, h->si.format, h->si.sections, h->si.seekable);
 
        return 0;
@@ -257,7 +257,7 @@ static void _pa_stream_write_callback(pa_stream *s, size_t length, void *userdat
        wave_info_t *h = (wave_info_t *)userdata;
 
        if (!s || length <= 0) {
-               debug_error("write error. stream(%p), length(%d)", s, length);
+               debug_error("write error. stream(%p), length(%zu)", s, length);
                return;
        }
 
@@ -277,7 +277,7 @@ static void _pa_stream_write_callback(pa_stream *s, size_t length, void *userdat
        if ((bytes = sf_readf_short(h->sf, data, (sf_count_t)(data_length / frame_size))) > 0)
                bytes *= (sf_count_t)frame_size;
 
-       debug_log("=== %lld / %d ===", bytes, data_length);
+       debug_log("=== %zu / %zu ===", bytes, data_length);
 
        if (bytes > 0)
                pa_stream_write(s, data, (size_t)bytes, NULL, 0, PA_SEEK_RELATIVE);
@@ -286,7 +286,7 @@ static void _pa_stream_write_callback(pa_stream *s, size_t length, void *userdat
 
        /* If No more data, drain stream */
        if (bytes < (sf_count_t)data_length) {
-               debug_msg("EOS!!!!! %lld/%d", bytes, data_length);
+               debug_msg("EOS!!!!! %zu/%zu", bytes, data_length);
 
                /* Handle loop */
                if (_sound_is_rewind_needed(h)) {
@@ -509,7 +509,7 @@ static int _mm_sound_plug_codec_wave_parse(const char *filename, mmsound_codec_i
        info->channels = si.channels;
        info->samplerate = si.samplerate;
 
-       debug_msg("filename = %s, frames[%lld], samplerate[%d], channels[%d], format[%x], sections[%d], seekable[%d]",
+       debug_msg("filename = %s, frames[%zu], samplerate[%d], channels[%d], format[%x], sections[%d], seekable[%d]",
                        filename, si.frames, si.samplerate, si.channels, si.format, si.sections, si.seekable);
        sf_close(sf);