Remove qnx modules.

[vlc] / modules / codec / cmml / xarray.c

diff --git a/modules/codec/cmml/xarray.c b/modules/codec/cmml/xarray.c
index 6ec745ea4a8d52f1be2f89ed6c944ec50eaf56cd..f33d47c14f466f448c610567df5cdc0a6ef5b207 100644 (file)
--- a/modules/codec/cmml/xarray.c
+++ b/modules/codec/cmml/xarray.c
@@ -13,7 +13,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,14 +21,23 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <stddef.h>
 #include <stdlib.h>
-#include <string.h> /* memmove(1) */
-
+#include <string.h>
 #include "xarray.h"
 
+#include <vlc_memory.h>
+
+/* local prototypes */
+XArray * xarray_New (unsigned int);
+
+
 #define XARRAY_ASSERT_NOT_NULL(xarray) \
     { \
         if (xarray == NULL) return XARRAY_ENULLPOINTER; \
@@ -36,20 +45,18 @@
 
 #define XARRAY_BOUNDS_CHECK(xarray, index) \
     { \
-        if (index < 0) \
-            return XARRAY_ENEGATIVEINDEX; \
-        else if (xarray->last_valid_element != -1 && \
+        if (xarray->last_valid_element != -1 && \
                  (int) index > xarray->last_valid_element) \
             return XARRAY_EINDEXTOOLARGE; \
     }
 
 #define XARRAY_GROW_ARRAY(xarray) \
     { \
-        xarray->array = (void *) realloc (xarray->array, xarray->size * 2); \
+        xarray->array = realloc_or_free (xarray->array, xarray->size * 2); \
         if (xarray->array == NULL) return XARRAY_ENOMEM; \
     }
 
-XSTATIC XArray * xarray_New (unsigned int initial_size_hint)
+XArray * xarray_New (unsigned int initial_size_hint)
 {
     XArray *new_xarray = NULL;
     void *inner_array;
@@ -58,7 +65,7 @@ XSTATIC XArray * xarray_New (unsigned int initial_size_hint)
     new_xarray = (XArray *) malloc (sizeof(XArray));
     if (new_xarray == NULL) return NULL;
 
-    if (initial_size_hint <= 0)
+    if (initial_size_hint == 0)
         initial_size = XARRAY_DEFAULT_SIZE;
     else
         initial_size = initial_size_hint;
@@ -77,28 +84,10 @@ XSTATIC XArray * xarray_New (unsigned int initial_size_hint)
 
     new_xarray->array = inner_array;
 
-    /* Make a dummy reference to other functions, so that we don't get
-     * warnings about unused functions from the compiler.  Ahem :) */
-    while (0)
-    {
-        void *dummy_reference;
-
-        dummy_reference = xarray_AddObject;
-        dummy_reference = xarray_InsertObject;
-        dummy_reference = xarray_RemoveLastObject;
-        dummy_reference = xarray_RemoveObject;
-        dummy_reference = xarray_RemoveObjects;
-        dummy_reference = xarray_RemoveObjectsAfter;
-        dummy_reference = xarray_ReplaceObject;
-
-        dummy_reference = xarray_ObjectAtIndex;
-        dummy_reference = xarray_Count;
-    }
-    
     return new_xarray;
 }
 
-XSTATIC int xarray_ObjectAtIndex (XArray *xarray, unsigned int index,
+int xarray_ObjectAtIndex (XArray *xarray, unsigned int index,
         void **out_object)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
@@ -109,7 +98,7 @@ XSTATIC int xarray_ObjectAtIndex (XArray *xarray, unsigned int index,
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_AddObject (XArray *xarray, void *object)
+int xarray_AddObject (XArray *xarray, void *object)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
 
@@ -124,7 +113,7 @@ XSTATIC int xarray_AddObject (XArray *xarray, void *object)
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_InsertObject (XArray *xarray, void *object,
+int xarray_InsertObject (XArray *xarray, void *object,
         unsigned int at_index)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
@@ -150,7 +139,7 @@ XSTATIC int xarray_InsertObject (XArray *xarray, void *object,
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_RemoveLastObject (XArray *xarray)
+int xarray_RemoveLastObject (XArray *xarray)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
 
@@ -163,7 +152,7 @@ XSTATIC int xarray_RemoveLastObject (XArray *xarray)
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_RemoveObject (XArray *xarray, unsigned int at_index)
+int xarray_RemoveObject (XArray *xarray, unsigned int at_index)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
     XARRAY_BOUNDS_CHECK (xarray, at_index);
@@ -181,10 +170,10 @@ XSTATIC int xarray_RemoveObject (XArray *xarray, unsigned int at_index)
     xarray->array[xarray->last_valid_element] = NULL;
     --xarray->last_valid_element;
 
-    return XARRAY_SUCCESS;    
+    return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_RemoveObjects (XArray *xarray, unsigned int at_index,
+int xarray_RemoveObjects (XArray *xarray, unsigned int at_index,
         int count)
 {
     int i;
@@ -206,7 +195,7 @@ XSTATIC int xarray_RemoveObjects (XArray *xarray, unsigned int at_index,
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_RemoveObjectsAfter (XArray *xarray, unsigned int index)
+int xarray_RemoveObjectsAfter (XArray *xarray, unsigned int index)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
     XARRAY_BOUNDS_CHECK (xarray, index);
@@ -222,7 +211,7 @@ XSTATIC int xarray_RemoveObjectsAfter (XArray *xarray, unsigned int index)
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_ReplaceObject (XArray *xarray, unsigned int index,
+int xarray_ReplaceObject (XArray *xarray, unsigned int index,
         void *new_object)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);
@@ -233,7 +222,7 @@ XSTATIC int xarray_ReplaceObject (XArray *xarray, unsigned int index,
     return XARRAY_SUCCESS;
 }
 
-XSTATIC int xarray_Count (XArray *xarray, unsigned int *out_count)
+int xarray_Count (XArray *xarray, unsigned int *out_count)
 {
     XARRAY_ASSERT_NOT_NULL (xarray);