summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2017-08-25 19:05:32 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2017-08-25 19:05:32 +0900
commit8eb343751f3e0bd9335f4e38dc5b2936e7a0109b (patch)
treec3c63a1cc52bf8bb279579ca3aed027656645335
parentbc696e5f922886553bdcbf5240ffb0315346841c (diff)
downloadcamera-8eb343751f3e0bd9335f4e38dc5b2936e7a0109b.tar.gz
camera-8eb343751f3e0bd9335f4e38dc5b2936e7a0109b.tar.bz2
camera-8eb343751f3e0bd9335f4e38dc5b2936e7a0109b.zip
In signal handler, fds will be closed in fd-id table, but, closed fd by muse_core_connection_close is not removed from table. It can cause unexpected behavior in signal handler, so new API is added and it removes closed fd in fd-id table. [Version] 0.3.5 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20170825.1] Change-Id: Ie3ad3203f6b5f5d6d01789f0c46be07ce8a9f220 Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r--packaging/capi-media-camera.spec2
-rw-r--r--src/camera.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 41eb4c1..b9c6d1b 100644
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
Name: capi-media-camera
Summary: A Camera API
-Version: 0.3.4
+Version: 0.3.5
Release: 0
Group: Multimedia/API
License: Apache-2.0
diff --git a/src/camera.c b/src/camera.c
index cbd973c..898eef1 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -2343,7 +2343,7 @@ static void _camera_client_callback_destroy(camera_cb_info_s *cb_info)
}
if (cb_info->fd > -1) {
- muse_core_connection_close(cb_info->fd);
+ muse_client_close(cb_info->fd);
cb_info->fd = -1;
}
@@ -2503,7 +2503,7 @@ int _camera_independent_request(int api, int device_type, const char *key, int *
_REQUEST_EXIT:
if (sock_fd > -1) {
- muse_core_connection_close(sock_fd);
+ muse_client_close(sock_fd);
sock_fd = -1;
}
@@ -2624,7 +2624,7 @@ ErrorExit:
}
if (sock_fd > -1) {
- muse_core_connection_close(sock_fd);
+ muse_client_close(sock_fd);
sock_fd = -1;
}