summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiWoong Kim <giwoong.kim@samsung.com>2014-10-29 14:29:47 +0900
committerGiWoong Kim <giwoong.kim@samsung.com>2014-10-29 14:29:47 +0900
commit207437ad9728862404248512bbf8389ba02d1350 (patch)
tree579b413a329072d37720310d309b70ccbd006dc6
parent4fcaf981edacb94ca0f2c59318973313005dd15e (diff)
downloadqemu-207437ad9728862404248512bbf8389ba02d1350.tar.gz
qemu-207437ad9728862404248512bbf8389ba02d1350.tar.bz2
qemu-207437ad9728862404248512bbf8389ba02d1350.zip
maru_shm: consider unsigned short
Change-Id: Iae40500ef645f5fa403f99a4fee55ef33f787baf Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
-rw-r--r--tizen/src/display/maru_shm.c4
-rw-r--r--tizen/src/skin/client/native_src/share.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/tizen/src/display/maru_shm.c b/tizen/src/display/maru_shm.c
index c1967a173a..414491ae51 100644
--- a/tizen/src/display/maru_shm.c
+++ b/tizen/src/display/maru_shm.c
@@ -206,7 +206,7 @@ static void maru_shm_quit(void)
if (shmctl(skin_shmid, IPC_STAT, &shm_info) == -1) {
ERR("shmctl failed\n");
- shm_info.shm_nattch = -1;
+ shm_info.shm_nattch = 0;
}
if (shmdt(shared_memory) == -1) {
@@ -224,7 +224,7 @@ static void maru_shm_quit(void)
} else {
INFO("shared memory was removed\n");
}
- } else if (shm_info.shm_nattch != -1) {
+ } else {
INFO("number of current attaches = %d\n",
(int)shm_info.shm_nattch);
}
diff --git a/tizen/src/skin/client/native_src/share.c b/tizen/src/skin/client/native_src/share.c
index 4063908bb6..b96d48e9ac 100644
--- a/tizen/src/skin/client/native_src/share.c
+++ b/tizen/src/skin/client/native_src/share.c
@@ -106,7 +106,7 @@ JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmdt
fflush(stderr);
perror("share.c: ");
- shm_info.shm_nattch = -1;
+ shm_info.shm_nattch = 0;
}
fprintf(stdout, "share.c: clean up the shared memory\n");
@@ -129,7 +129,7 @@ JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmdt
perror("share.c: ");
return 2;
}
- } else if (shm_info.shm_nattch != -1) {
+ } else {
fprintf(stdout, "share.c: number of current attaches = %d\n",
(int)shm_info.shm_nattch);
fflush(stdout);