[BACK]Return to array.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / src

Diff for /libaitio/src/Attic/array.c between versions 1.1.2.1 and 1.1.2.4

version 1.1.2.1, 2011/04/19 21:07:32 version 1.1.2.4, 2011/04/20 08:09:13
Line 1 Line 1
 /*************************************************************************  /*************************************************************************
* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
*  by Michael Pounov <misho@openbsd-bg.org>*  by Michael Pounov <misho@elwix.org>
 *  *
 * $Author$  * $Author$
 * $Id$  * $Id$
 *  *
*************************************************************************/**************************************************************************
 The ELWIX and AITNET software is distributed under the following
 terms:
 
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
         by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. 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.
 3. All advertising materials mentioning features or use of this software
    must display the following acknowledgement:
 This product includes software developed by Michael Pounov <misho@elwix.org>
 ELWIX - Embedded LightWeight unIX and its contributors.
 4. Neither the name of the University nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 "global.h"  #include "global.h"
   
   
Line 123  io_arrayGrow(array_t * __restrict arr, int newNumItems Line 160  io_arrayGrow(array_t * __restrict arr, int newNumItems
                                 free(arr->arr_data[i]);                                  free(arr->arr_data[i]);
                                 */                                  */
   
           arr->arr_num = newNumItems;
         data = realloc(arr->arr_data, arr->arr_num * sizeof(void*));          data = realloc(arr->arr_data, arr->arr_num * sizeof(void*));
         if (!data) {          if (!data) {
                 LOGERR;                  LOGERR;
                 return -1;                  return -1;
         } else          } else
                 arr->arr_data = data;                  arr->arr_data = data;
        memset(arr->arr_data + arr->arr_num, 0, n * sizeof(void*));        memset(arr->arr_data + (arr->arr_num - n), 0, n * sizeof(void*));
        arr->arr_num = newNumItems; 
   
         return 0;          return 0;
 }  }
Line 185  io_arrayVacuum(array_t * __restrict arr, int fromWhere Line 222  io_arrayVacuum(array_t * __restrict arr, int fromWhere
         }          }
   
         return cx;          return cx;
   }
   
   /*
    * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position
    * @arr = Array
    * @data = Element, if set NULL return only first empty position
    * return: -1 not found empty position, array is full!, >-1 return position of stored element into array
    */
   inline int
   io_arrayPush(array_t * __restrict arr, void **data)
   {
           register int i;
           int ret = -1;
   
           assert(arr);
   
           for (i = 0; i < arr->arr_num; i++)
                   if (!arr->arr_data[i]) {
                           if (data)
                                   arr->arr_data[i] = *data;
                           ret = i;
                           break;
                   }
   
           return ret;
   }
   
   /*
    * io_arrayPop() - Pop element from dynamic array like stack manner, last used position
    * @arr = Array
    * @data = Element, if set NULL return only first empty position
    * @delAfter = Delete after Pop element, !=0 delete element from array after return data
    * return: -1 not found used position, array is empty!, >-1 return element position
    */
   inline int
   io_arrayPop(array_t * __restrict arr, void ** __restrict data, int delAfter)
   {
           register int i;
           int ret = -1;
   
           assert(arr);
   
           for (i = arr->arr_num - 1; i >= 0; i--)
                   if (arr->arr_data[i]) {
                           if (data)
                                   *data = arr->arr_data[i];
                           if (delAfter)
                                   arr->arr_data[i] = NULL;
                           ret = i;
                           break;
                   }
   
           return ret;
 }  }
   
 /*  /*
Removed from v.1.1.2.1  
changed lines
  Added in v.1.1.2.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>