From: Omri Mor <omor1@asu.edu>
Date: Sun, 30 Apr 2017 21:32:03 +0000 (-0700)
Subject: os/os-android.h: fix broken shmget() due to ndk-r15
X-Git-Tag: fio-2.20~27
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=91f643461babe7ee83870e28f6b6120d2b52c742;p=fio.git

os/os-android.h: fix broken shmget() due to ndk-r15

Fixes: #346 ("Compiling for Android using ndk-r15")
Signed-off-by: Omri Mor <omor1@asu.edu>
---

diff --git a/os/os-android.h b/os/os-android.h
index b59fac15..904843f6 100644
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -84,14 +84,14 @@ static inline int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf)
 static inline int shmget (key_t __key, size_t __size, int __shmflg)
 {
 	int fd,ret;
-	char key[11];
-	
+	char keybuf[11];
+
 	fd = open(ASHMEM_DEVICE, O_RDWR);
 	if (fd < 0)
 		return fd;
 
-	sprintf(key,"%d",__key);
-	ret = ioctl(fd, ASHMEM_SET_NAME, key);
+	sprintf(keybuf,"%d",__key);
+	ret = ioctl(fd, ASHMEM_SET_NAME, keybuf);
 	if (ret < 0)
 		goto error;
 
@@ -100,7 +100,7 @@ static inline int shmget (key_t __key, size_t __size, int __shmflg)
 		goto error;
 
 	return fd;
-	
+
 error:
 	close(fd);
 	return ret;