[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.4 and 1.2.4.1

version 1.1.2.4, 2011/04/20 08:09:13 version 1.2.4.1, 2011/05/19 02:22:46
Line 27  are met: Line 27  are met:
    must display the following acknowledgement:     must display the following acknowledgement:
 This product includes software developed by Michael Pounov <misho@elwix.org>  This product includes software developed by Michael Pounov <misho@elwix.org>
 ELWIX - Embedded LightWeight unIX and its contributors.  ELWIX - Embedded LightWeight unIX and its contributors.
4. Neither the name of the University nor the names of its contributors4. Neither the name of AITNET nor the names of its contributors
    may be used to endorse or promote products derived from this software     may be used to endorse or promote products derived from this software
    without specific prior written permission.     without specific prior written permission.
   
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' ANDTHIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
Line 75  io_arrayInit(int numItems) Line 75  io_arrayInit(int numItems)
 }  }
   
 /*  /*
 * io_arrayFree() - Free all data in dynamic array * io_arrayFree() - Free all data in dynamic array items
  *      (WARNING! If assign static array dont use this!!!)   *      (WARNING! If assign static array dont use this!!!)
  * @arr = Array   * @arr = Array
  * return: none   * return: none
Line 97  io_arrayFree(array_t * __restrict arr) Line 97  io_arrayFree(array_t * __restrict arr)
 }  }
   
 /*  /*
 * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array * io_arrayDestroy() - Free and destroy dynamic array
  * @parr = Array   * @parr = Array
  * return: none   * return: none
  */   */
Line 275  io_arrayPop(array_t * __restrict arr, void ** __restri Line 275  io_arrayPop(array_t * __restrict arr, void ** __restri
                 }                  }
   
         return ret;          return ret;
   }
   
   /*
    * io_arrayConcat() Concat source array to destination array
    * @dest = Destination array
    * @src = Source array
    * return: -1 error; >0 new count of destination array
    */
   int
   io_arrayConcat(array_t * __restrict dest, array_t * __restrict src)
   {
           int n;
   
           assert(dest);
           assert(src);
           if (!dest || !src)
                   return -1;
   
           n = dest->arr_num;
           if (io_arrayGrow(dest, n + src->arr_num))
                   return -1;
           memcpy(dest->arr_data + n, src->arr_data, src->arr_num * sizeof(void*));
   
           return io_arraySize(dest);
 }  }
   
 /*  /*
Removed from v.1.1.2.4  
changed lines
  Added in v.1.2.4.1

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