Diff for /libelwix/inc/elwix/aarray.h between versions 1.2 and 1.6

version 1.2, 2013/05/30 09:07:33 version 1.6, 2015/06/25 17:53:49
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013Copyright 2004 - 2015
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 58  typedef struct _tagArray { Line 58  typedef struct _tagArray {
 #define array_Zero(_arr)                (assert((_arr)), memset((_arr)->arr_data, 0, \  #define array_Zero(_arr)                (assert((_arr)), memset((_arr)->arr_data, 0, \
                                                 array_Size((_arr)) * sizeof(intptr_t)))                                                  array_Size((_arr)) * sizeof(intptr_t)))
   
   #define array_Ptr(_arr, _d)             ((_arr) ? (_arr)->arr_data[_d] : NULL)
 #define array_Get2(_arr, _d)            (assert((_arr) && (_arr)->arr_num > _d), ((_arr)->arr_data + _d))  #define array_Get2(_arr, _d)            (assert((_arr) && (_arr)->arr_num > _d), ((_arr)->arr_data + _d))
 #define array_Get(_arr, _d)             (assert((_arr) && (_arr)->arr_num > _d), (_arr)->arr_data[_d])  #define array_Get(_arr, _d)             (assert((_arr) && (_arr)->arr_num > _d), (_arr)->arr_data[_d])
 #define array(_arr, _d, _type)          (assert((_arr) && (_arr)->arr_num > _d), \  #define array(_arr, _d, _type)          (assert((_arr) && (_arr)->arr_num > _d), \
Line 106  void array_Free(array_t * __restrict arr); Line 107  void array_Free(array_t * __restrict arr);
 array_t *array_From(const char *** __restrict pargv, int argc);  array_t *array_From(const char *** __restrict pargv, int argc);
 /*  /*
  * array_Args() Parse and make array from arguments ... (input string will be modified!!!    * array_Args() Parse and make array from arguments ... (input string will be modified!!! 
 *      and output array must be free with io_arrayDestroy() after use!) *      and output array must be free with array_Destroy() after use!)
  *   *
  * @psArgs = Input arguments line, after execute string is modified!!!   * @psArgs = Input arguments line, after execute string is modified!!!
  * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs   * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs
Line 160  int array_Concat(array_t * __restrict dest, array_t *  Line 161  int array_Concat(array_t * __restrict dest, array_t * 
 /*  /*
  * array_Copy() Copy source array to destination array   * array_Copy() Copy source array to destination array
  *   *
 * @dest = Destination array, after use free with io_arrayDestroy() * @dest = Destination array, after use free with array_Destroy()
  * @src = Source array   * @src = Source array
  * return: -1 error; >0 count of destination array   * return: -1 error; >0 count of destination array
  */   */

Removed from v.1.2  
changed lines
  Added in v.1.6


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