[Android] Fix sem_destroy

[Rafaël Carré]

android | branch: master | Rafaël Carré <funman at videolan.org> | Sun May 20 17:41:15 2012 -0400| [3e4d385e1b8a8f6221a4c579860365801a8a4c99] | committer: Rafaël Carré

Fix sem_destroy

Needed for 2.1 and 2.2

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=3e4d385e1b8a8f6221a4c579860365801a8a4c99
---

 vlc-android/jni/Android.mk |    2 +-
 vlc-android/jni/sem.c      |   51 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index 06480cb..fc807ac 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE    := libvlcjni
 
-LOCAL_SRC_FILES := libvlcjni.c aout.c thumbnailer.c pthread-condattr.c pthread-rwlocks.c eventfd.c
+LOCAL_SRC_FILES := libvlcjni.c aout.c thumbnailer.c pthread-condattr.c pthread-rwlocks.c eventfd.c sem.c
 
 LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
 
diff --git a/vlc-android/jni/sem.c b/vlc-android/jni/sem.c
new file mode 100644
index 0000000..244ccab
--- /dev/null
+++ b/vlc-android/jni/sem.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <semaphore.h>
+#include <errno.h>
+#include <stddef.h>
+
+#define SEMCOUNT_VALUE_SHIFT      1
+/* convert a sem->count bit pattern into the corresponding signed value */
+#define SEMCOUNT_TO_VALUE(sval)  ((int)(sval) >> SEMCOUNT_VALUE_SHIFT)
+
+int sem_destroy(sem_t *sem)
+{
+    int count;
+
+    if (sem == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
+    count = SEMCOUNT_TO_VALUE(sem->count);
+    if (count < 0) {
+        errno = EBUSY;
+        return -1;
+    }
+    sem->count = 0;
+    return 0;
+}