*************************************************************************
* Copyright (C) 2004 Commonwealth Scientific and Industrial Research
* Organisation (CSIRO) Australia
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
*
* $Id$
*
* 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
*
* 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"
+/* local prototypes */
+XArray * xarray_New (unsigned int);
+
+
#define XARRAY_ASSERT_NOT_NULL(xarray) \
{ \
if (xarray == NULL) return XARRAY_ENULLPOINTER; \
#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; \
}
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;
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;
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);
return XARRAY_SUCCESS;
}
-XSTATIC int xarray_AddObject (XArray *xarray, void *object)
+int xarray_AddObject (XArray *xarray, void *object)
{
XARRAY_ASSERT_NOT_NULL (xarray);
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);
return XARRAY_SUCCESS;
}
-XSTATIC int xarray_RemoveLastObject (XArray *xarray)
+int xarray_RemoveLastObject (XArray *xarray)
{
XARRAY_ASSERT_NOT_NULL (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);
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;
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);
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);
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);