[BACK]Return to aitio.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.9.2.4 and 1.10.2.2

version 1.9.2.4, 2011/05/19 03:01:19 version 1.10.2.2, 2011/08/25 14:31:32
Line 233  inline void io_arrayDestroy(array_t ** __restrict parr Line 233  inline void io_arrayDestroy(array_t ** __restrict parr
 inline void io_arrayFree(array_t * __restrict arr);  inline void io_arrayFree(array_t * __restrict arr);
 /*  /*
  * io_arrayFrom() - Create and fill array from array with pointers   * io_arrayFrom() - Create and fill array from array with pointers
 * @argv = Array with pointers * @pargv = Array with pointers
  * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item   * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item
 * return: NULL error, != NULL allocated memory for array * return: NULL error, != NULL allocated new array
  */   */
inline array_t *io_arrayFrom(const char **argv, int argc);inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc);
 /*  /*
  * io_arrayTo() - Create and fill array with pointers from dynamic array   * io_arrayTo() - Create and fill array with pointers from dynamic array
  * @arr = Array   * @arr = Array
 * return: NULL error, != NULL allocated memory for array * return: NULL error, != NULL allocated memory for array, NULL terminated
  */   */
 inline char **io_arrayTo(array_t * __restrict arr);  inline char **io_arrayTo(array_t * __restrict arr);
 /*  /*
Line 280  int io_arrayVacuum(array_t * __restrict arr, int fromW Line 280  int io_arrayVacuum(array_t * __restrict arr, int fromW
                                                 assert(_arr && _arr->arr_num > _d); \                                                  assert(_arr && _arr->arr_num > _d); \
                                                 *(_arr->arr_data + _d) = (void*) _ptr; \                                                  *(_arr->arr_data + _d) = (void*) _ptr; \
                                         } while (0)                                          } while (0)
#define io_arrayDel(_arr, _d)               do { \#define io_arrayDel(_arr, _d, _fri)        do { \
                                                 assert(_arr && _arr->arr_num > _d); \                                                  assert(_arr && _arr->arr_num > _d); \
                                                   if (_fri) \
                                                           free(*(_arr->arr_data + _d)); \
                                                 *(_arr->arr_data + _d) = NULL; \                                                  *(_arr->arr_data + _d) = NULL; \
                                         } while (0)                                          } while (0)
   
Line 295  inline int io_arrayPush(array_t * __restrict arr, void Line 297  inline int io_arrayPush(array_t * __restrict arr, void
 /*  /*
  * io_arrayPop() - Pop element from dynamic array like stack manner, last used position   * io_arrayPop() - Pop element from dynamic array like stack manner, last used position
  * @arr = Array   * @arr = Array
 * @data = Element, if set NULL return only first empty position * @data = Element, if set NULL return only last used position
  * @delAfter = Delete after Pop element, !=0 delete element from array after return data   * @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   * return: -1 not found used position, array is empty!, >-1 return element position
  */   */
Line 386  void *io_sarrGet2(sarr_t * __restrict arr, unsigned in Line 388  void *io_sarrGet2(sarr_t * __restrict arr, unsigned in
 inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data);  inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data);
 #define io_sarrDel(_arr, _idx)          io_sarrSet(_arr, _idx, NULL)  #define io_sarrDel(_arr, _idx)          io_sarrSet(_arr, _idx, NULL)
 #define io_sarr(_arr, _idx, _type)      (_type)io_sarrGet(_arr, _idx)  #define io_sarr(_arr, _idx, _type)      (_type)io_sarrGet(_arr, _idx)
   /*
    * io_sarr2array() - Convert from split-order array to dynamic array
    * @sa = split array
    * @sarrFree = after convert split array !=0 will be destroyed sarray
    * return: NULL error or != NULL new array
    */
   array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree);
   /*
    * io_array2sarr() - Convert from dynamic array to split-order array
    * @a = array
    * @arrFree = after convert array !=0 will be destroyed
    * return: NULL error or != NULL new sarr
    */
   sarr_t *io_array2sarr(array_t ** __restrict a, int arrFree);
   
 /*  /*
  * io_CopyEnv() Copy environment to new environment array;   * io_CopyEnv() Copy environment to new environment array;
Removed from v.1.9.2.4  
changed lines
  Added in v.1.10.2.2

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