X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fcmml%2Fxarray.c;h=81f3494ff1bb0092761547698860fbb3ac2d86f7;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=e0383a79ef5f911081331e96b281c19c1648dd5e;hpb=84cad9ba868a20f981ddb428f82c4fdd30bc5e38;p=vlc diff --git a/modules/codec/cmml/xarray.c b/modules/codec/cmml/xarray.c index e0383a79ef..81f3494ff1 100644 --- a/modules/codec/cmml/xarray.c +++ b/modules/codec/cmml/xarray.c @@ -3,7 +3,7 @@ ************************************************************************* * Copyright (C) 2004 Commonwealth Scientific and Industrial Research * Organisation (CSIRO) Australia - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * * $Id$ * @@ -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,12 +21,12 @@ * * 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. ************************************************************************/ +#include #include -#include /* memmove(1) */ - +#include #include "xarray.h" #define XARRAY_ASSERT_NOT_NULL(xarray) \ @@ -94,7 +94,7 @@ XSTATIC XArray * xarray_New (unsigned int initial_size_hint) dummy_reference = xarray_ObjectAtIndex; dummy_reference = xarray_Count; } - + return new_xarray; } @@ -181,7 +181,7 @@ 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,