Fix KONA issue - Invalid log parameter

[Version] 0.3.6
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: Icc029f50e129629b814b794a7798f5d32edc6a5b
Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 92ddf78..261cba0 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -397,7 +397,7 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
                if (device_state != -1) {
                        emit_value = handle->device_type << 16 | device_state;
 
-                       LOGD("camera devce state change signal [0x8x]", emit_value);
+                       LOGD("camera devce state change signal [0x%08x]", emit_value);
 
                        legacy_camera_emit_signal((camera_h)handle,
                                MM_CAMCORDER_DBUS_OBJECT,

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 5a35807..8ca6d80 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -1573,7 +1573,7 @@ int camera_dispatcher_create(muse_module_h module)
        muse_camera->preview_cb_flag = 0;
        muse_camera->module = module;
 
-       LOGD("handle : 0x%x", muse_camera);
+       LOGD("handle : %p", muse_camera);
 
        muse_server_ipc_set_handle(module, (intptr_t)muse_camera);
        muse_camera_msg_return1(api, class, ret, module, MUSE_CAMERA_GET_TYPE_POINTER, -1, "handle", 0, muse_camera);
@@ -1871,7 +1871,7 @@ int camera_dispatcher_start_face_detection(muse_module_h module)
 
        muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module);
 
-       LOGD("Enter, handle : 0x%x, module : %d", muse_camera, module);
+       LOGD("Enter, handle : %p, module : %p", muse_camera, module);
 
        ret = legacy_camera_start_face_detection(muse_camera->camera_handle,
                (camera_face_detected_cb)_camera_dispatcher_face_detected_cb,
@@ -1935,7 +1935,7 @@ int camera_dispatcher_start_focusing(muse_module_h module)
 
        muse_camera_msg_get(is_continuous, muse_server_module_get_msg(module));
 
-       LOGD("Enter, handle : 0x%x, module : %d", muse_camera, module);
+       LOGD("Enter, handle : %p, module : %p", muse_camera, module);
 
        ret = legacy_camera_start_focusing(muse_camera->camera_handle, (bool)is_continuous);
 
@@ -1974,7 +1974,7 @@ int camera_dispatcher_set_display(muse_module_h module)
 
        muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module);
 
-       LOGD("handle : 0x%x", muse_camera);
+       LOGD("handle : %p", muse_camera);
 
        camera = muse_camera->camera_handle;
 
@@ -2055,7 +2055,7 @@ int camera_dispatcher_set_capture_format(muse_module_h module)
 
        muse_camera_msg_get(set_format, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_format : %d", muse_camera, set_format);
+       LOGD("handle : %p, set_format : %d", muse_camera, set_format);
 
        ret = legacy_camera_set_capture_format(muse_camera->camera_handle, (camera_pixel_format_e)set_format);
 
@@ -2076,7 +2076,7 @@ int camera_dispatcher_set_preview_format(muse_module_h module)
 
        muse_camera_msg_get(set_format, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_format : %d", muse_camera, set_format);
+       LOGD("handle : %p, set_format : %d", muse_camera, set_format);
 
        ret = legacy_camera_set_preview_format(muse_camera->camera_handle, (camera_pixel_format_e)set_format);
 
@@ -2123,7 +2123,7 @@ int camera_dispatcher_set_display_rotation(muse_module_h module)
 
        muse_camera_msg_get(set_rotation, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_rotation : %d", muse_camera, set_rotation);
+       LOGD("handle : %p, set_rotation : %d", muse_camera, set_rotation);
 
        ret = legacy_camera_set_display_rotation(muse_camera->camera_handle, (camera_rotation_e)set_rotation);
 
@@ -2167,7 +2167,7 @@ int camera_dispatcher_set_display_flip(muse_module_h module)
 
        muse_camera_msg_get(set_flip, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_flip : %d", muse_camera, set_flip);
+       LOGD("handle : %p, set_flip : %d", muse_camera, set_flip);
 
        ret = legacy_camera_set_display_flip(muse_camera->camera_handle, (camera_flip_e)set_flip);
 
@@ -2211,7 +2211,7 @@ int camera_dispatcher_set_display_visible(muse_module_h module)
 
        muse_camera_msg_get(set_visible, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_visible : %d", muse_camera, set_visible);
+       LOGD("handle : %p, set_visible : %d", muse_camera, set_visible);
 
        ret = legacy_camera_set_display_visible(muse_camera->camera_handle, (bool)set_visible);
 
@@ -2255,7 +2255,7 @@ int camera_dispatcher_set_display_mode(muse_module_h module)
 
        muse_camera_msg_get(set_mode, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, display_mode : %d", muse_camera, set_mode);
+       LOGD("handle : %p, display_mode : %d", muse_camera, set_mode);
 
        ret = legacy_camera_set_display_mode(muse_camera->camera_handle, (camera_display_mode_e)set_mode);
 
@@ -2979,7 +2979,7 @@ int camera_dispatcher_attr_set_image_quality(muse_module_h module)
 
        muse_camera_msg_get(quality, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, image_quality : %d", muse_camera, quality);
+       LOGD("handle : %p, image_quality : %d", muse_camera, quality);
 
        ret = legacy_camera_attr_set_image_quality(muse_camera->camera_handle, quality);
 
@@ -3048,7 +3048,7 @@ int camera_dispatcher_attr_set_zoom(muse_module_h module)
 
        muse_camera_msg_get(zoom, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, zoom : %d", muse_camera, zoom);
+       LOGD("handle : %p, zoom : %d", muse_camera, zoom);
 
        ret = legacy_camera_attr_set_zoom(muse_camera->camera_handle, zoom);
 
@@ -3071,7 +3071,7 @@ int camera_dispatcher_attr_set_af_mode(muse_module_h module)
 
        muse_camera_msg_get(set_mode, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode);
+       LOGD("handle : %p, set_mode : %d", muse_camera, set_mode);
 
        ret = legacy_camera_attr_set_af_mode(muse_camera->camera_handle, (camera_attr_af_mode_e)set_mode);
 
@@ -3142,7 +3142,7 @@ int camera_dispatcher_attr_set_exposure_mode(muse_module_h module)
 
        muse_camera_msg_get(set_mode, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode);
+       LOGD("handle : %p, set_mode : %d", muse_camera, set_mode);
 
        ret = legacy_camera_attr_set_exposure_mode(muse_camera->camera_handle, (camera_attr_exposure_mode_e)set_mode);
 
@@ -3165,7 +3165,7 @@ int camera_dispatcher_attr_set_exposure(muse_module_h module)
 
        muse_camera_msg_get(value, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, value : %d", muse_camera, value);
+       LOGD("handle : %p, value : %d", muse_camera, value);
 
        ret = legacy_camera_attr_set_exposure(muse_camera->camera_handle, value);
 
@@ -3188,7 +3188,7 @@ int camera_dispatcher_attr_set_iso(muse_module_h module)
 
        muse_camera_msg_get(set_iso, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_iso : %d", muse_camera, set_iso);
+       LOGD("handle : %p, set_iso : %d", muse_camera, set_iso);
 
        ret = legacy_camera_attr_set_iso(muse_camera->camera_handle, (camera_attr_iso_e)set_iso);
 
@@ -3211,7 +3211,7 @@ int camera_dispatcher_attr_set_brightness(muse_module_h module)
 
        muse_camera_msg_get(level, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, level : %d", muse_camera, level);
+       LOGD("handle : %p, level : %d", muse_camera, level);
 
        ret = legacy_camera_attr_set_brightness(muse_camera->camera_handle, level);
 
@@ -3234,7 +3234,7 @@ int camera_dispatcher_attr_set_contrast(muse_module_h module)
 
        muse_camera_msg_get(level, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, level : %d", muse_camera, level);
+       LOGD("handle : %p, level : %d", muse_camera, level);
 
        ret = legacy_camera_attr_set_contrast(muse_camera->camera_handle, level);
 
@@ -3257,7 +3257,7 @@ int camera_dispatcher_attr_set_whitebalance(muse_module_h module)
 
        muse_camera_msg_get(set_whitebalance, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_whitebalance : %d", muse_camera, set_whitebalance);
+       LOGD("handle : %p, set_whitebalance : %d", muse_camera, set_whitebalance);
 
        ret = legacy_camera_attr_set_whitebalance(muse_camera->camera_handle, (camera_attr_whitebalance_e)set_whitebalance);
 
@@ -3280,7 +3280,7 @@ int camera_dispatcher_attr_set_effect(muse_module_h module)
 
        muse_camera_msg_get(set_effect, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_effect : %d", muse_camera, set_effect);
+       LOGD("handle : %p, set_effect : %d", muse_camera, set_effect);
 
        ret = legacy_camera_attr_set_effect(muse_camera->camera_handle, (camera_attr_effect_mode_e)set_effect);
 
@@ -3303,7 +3303,7 @@ int camera_dispatcher_attr_set_scene_mode(muse_module_h module)
 
        muse_camera_msg_get(set_mode, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode);
+       LOGD("handle : %p, set_mode : %d", muse_camera, set_mode);
 
        ret = legacy_camera_attr_set_scene_mode(muse_camera->camera_handle, (camera_attr_scene_mode_e)set_mode);
 
@@ -3326,7 +3326,7 @@ int camera_dispatcher_attr_enable_tag(muse_module_h module)
 
        muse_camera_msg_get(set_enable, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_enable : %d", muse_camera, set_enable);
+       LOGD("handle : %p, set_enable : %d", muse_camera, set_enable);
 
        ret = legacy_camera_attr_enable_tag(muse_camera->camera_handle, (bool)set_enable);
 
@@ -3349,7 +3349,7 @@ int camera_dispatcher_attr_set_tag_image_description(muse_module_h module)
 
        muse_camera_msg_get_string(description, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, description : %s", muse_camera, description);
+       LOGD("handle : %p, description : %s", muse_camera, description);
 
        ret = legacy_camera_attr_set_tag_image_description(muse_camera->camera_handle, description);
 
@@ -3372,7 +3372,7 @@ int camera_dispatcher_attr_set_tag_orientation(muse_module_h module)
 
        muse_camera_msg_get(set_orientation, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_orientation : %d", muse_camera, set_orientation);
+       LOGD("handle : %p, set_orientation : %d", muse_camera, set_orientation);
 
        ret = legacy_camera_attr_set_tag_orientation(muse_camera->camera_handle, (camera_attr_tag_orientation_e)set_orientation);
 
@@ -3395,7 +3395,7 @@ int camera_dispatcher_attr_set_tag_software(muse_module_h module)
 
        muse_camera_msg_get_string(software, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, software : %s", muse_camera, software);
+       LOGD("handle : %p, software : %s", muse_camera, software);
 
        ret = legacy_camera_attr_set_tag_software(muse_camera->camera_handle, software);
 
@@ -3418,7 +3418,7 @@ int camera_dispatcher_attr_set_geotag(muse_module_h module)
 
        muse_camera_msg_get_array(set_geotag, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_geotag1 : %d, set_geotag2 : %d, set_geotag3 : %d",
+       LOGD("handle : %p, set_geotag1 : %f, set_geotag2 : %f, set_geotag3 : %f",
             muse_camera, set_geotag[0], set_geotag[1], set_geotag[2]);
 
        ret = legacy_camera_attr_set_geotag(muse_camera->camera_handle, set_geotag[0], set_geotag[1], set_geotag[2]);
@@ -3464,7 +3464,7 @@ int camera_dispatcher_attr_set_flash_mode(muse_module_h module)
 
        muse_camera_msg_get(set_mode, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode);
+       LOGD("handle : %p, set_mode : %d", muse_camera, set_mode);
 
        ret = legacy_camera_attr_set_flash_mode(muse_camera->camera_handle, (camera_attr_flash_mode_e)set_mode);
        if (ret == CAMERA_ERROR_NONE) {
@@ -3841,9 +3841,11 @@ int camera_dispatcher_attr_get_tag_image_description(muse_module_h module)
 
        muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module);
 
+       LOGD("handle : %p", muse_camera);
+
        ret = legacy_camera_attr_get_tag_image_description(muse_camera->camera_handle, &get_value);
        if (ret == CAMERA_ERROR_NONE) {
-               LOGD("get_description : %s", muse_camera, get_value);
+               LOGD("get_description : %s", get_value);
                muse_camera_msg_return1(api, class, ret, module, MUSE_CAMERA_GET_TYPE_STRING,
                        MUSE_CAMERA_GET_STRING_TAG_IMAGE_DESCRIPTION, "get_value", 0, get_value);
        } else {
@@ -3995,7 +3997,7 @@ int camera_dispatcher_attr_foreach_supported_exposure_mode(muse_module_h module)
 
        muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module);
 
-       LOGD("handle : 0x%x, api : %d", muse_camera, api);
+       LOGD("handle : %p, api : %d", muse_camera, api);
 
        ret = legacy_camera_attr_foreach_supported_exposure_mode(muse_camera->camera_handle,
                (camera_attr_supported_exposure_mode_cb)_camera_dispatcher_callback_supported_exposure_mode,
@@ -4665,7 +4667,7 @@ int camera_dispatcher_attr_set_encoded_preview_bitrate(muse_module_h module)
 
        muse_camera_msg_get(set_bitrate, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_encoded_preview_bitrate : %d", muse_camera, set_bitrate);
+       LOGD("handle : %p, set_encoded_preview_bitrate : %d", muse_camera, set_bitrate);
 
        ret = legacy_camera_attr_set_encoded_preview_bitrate(muse_camera->camera_handle, set_bitrate);
 
@@ -4711,7 +4713,7 @@ int camera_dispatcher_attr_set_encoded_preview_gop_interval(muse_module_h module
 
        muse_camera_msg_get(set_gop_interval, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, set_encoded_preview_gop_interval : %d", muse_camera, set_gop_interval);
+       LOGD("handle : %p, set_encoded_preview_gop_interval : %d", muse_camera, set_gop_interval);
 
        ret = legacy_camera_attr_set_encoded_preview_gop_interval(muse_camera->camera_handle, set_gop_interval);
 
@@ -4739,7 +4741,7 @@ int camera_dispatcher_attr_set_pan(muse_module_h module)
        type = value >> 16;
        step = 0x0000ffff & value;
 
-       LOGD("handle : 0x%x - type %d, step %d", muse_camera, type, step);
+       LOGD("handle : %p - type %d, step %d", muse_camera, type, step);
 
        ret = legacy_camera_attr_set_pan(muse_camera->camera_handle, type, step);
 
@@ -4814,7 +4816,7 @@ int camera_dispatcher_attr_set_tilt(muse_module_h module)
        type = value >> 16;
        step = 0x0000ffff & value;
 
-       LOGD("handle : 0x%x - type %d, step %d", muse_camera, type, step);
+       LOGD("handle : %p - type %d, step %d", muse_camera, type, step);
 
        ret = legacy_camera_attr_set_tilt(muse_camera->camera_handle, type, step);
 
@@ -4884,7 +4886,7 @@ int camera_dispatcher_attr_set_ptz_type(muse_module_h module)
 
        muse_camera_msg_get(set_ptz_type, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x", muse_camera);
+       LOGD("handle : %p", muse_camera);
 
        ret = legacy_camera_attr_set_ptz_type(muse_camera->camera_handle, set_ptz_type);
 
@@ -4929,7 +4931,7 @@ int camera_dispatcher_attr_set_display_roi_area(muse_module_h module)
 
        muse_camera_msg_get_array(set_display_roi_area, muse_server_module_get_msg(module));
 
-       LOGD("handle : 0x%x, x : %d, y : %d, width : %d, height : %d", muse_camera,
+       LOGD("handle : %p, x : %d, y : %d, width : %d, height : %d", muse_camera,
                set_display_roi_area[0], set_display_roi_area[1], set_display_roi_area[2], set_display_roi_area[3]);
 
        ret = legacy_camera_attr_set_display_roi_area(muse_camera->camera_handle, set_display_roi_area);

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 9127d3e..c7ca014 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.3.5
+Version:    0.3.6
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0