[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.7.2.1 and 1.9.2.4

version 1.7.2.1, 2011/04/19 21:07:32 version 1.9.2.4, 2011/05/19 03:01:19
Line 1 Line 1
 /*************************************************************************  /*************************************************************************
* (C) 2010 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>* (C) 2010 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 AITNET 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 AITNET 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.
 */
 #ifndef __AITIO_H  #ifndef __AITIO_H
 #define __AITIO_H  #define __AITIO_H
   
Line 18 Line 55
 #define VACUUM_BETWEEN  2  #define VACUUM_BETWEEN  2
   
   
   typedef void ** sarr_seg_t;
   typedef struct _tagSplitArray {
           int             sarr_num;
           int             sarr_seg;
           int             sarr_siz;
           sarr_seg_t      *sarr_data;
   } sarr_t;
   
 typedef struct _tagArray {  typedef struct _tagArray {
         int     arr_num;          int     arr_num;
         void    **arr_data;          void    **arr_data;
Line 174  inline char *io_Hex2Ch(unsigned char *psLine, int line Line 219  inline char *io_Hex2Ch(unsigned char *psLine, int line
  */   */
 inline array_t *io_arrayInit(int numItems);  inline array_t *io_arrayInit(int numItems);
 /*  /*
 * 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
  */   */
 inline void io_arrayDestroy(array_t ** __restrict parr);  inline void io_arrayDestroy(array_t ** __restrict parr);
 /*  /*
 * 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
  */   */
 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
    * @argv = Array with pointers
    * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item
    * return: NULL error, != NULL allocated memory for array
    */
   inline array_t *io_arrayFrom(const char **argv, int argc);
   /*
    * io_arrayTo() - Create and fill array with pointers from dynamic array
    * @arr = Array
    * return: NULL error, != NULL allocated memory for array
    */
   inline char **io_arrayTo(array_t * __restrict arr);
   /*
  * io_arrayLen() - Get last used element in dynamic array (array Length)   * io_arrayLen() - Get last used element in dynamic array (array Length)
  * @arr = Array   * @arr = Array
  * return: -1 error, 0 empty or >0 position of last used element   * return: -1 error, 0 empty or >0 position of last used element
  */   */
 inline int io_arrayLen(array_t * __restrict arr);  inline int io_arrayLen(array_t * __restrict arr);
 /*  /*
    * 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);
   /*
  * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!!   * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!!
  * @arr = Array   * @arr = Array
  * @newNumItems = Number of Items   * @newNumItems = Number of Items
Line 215  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 { \
                                                   assert(_arr && _arr->arr_num > _d); \
                                                   *(_arr->arr_data + _d) = NULL; \
                                           } while (0)
   
 /*  /*
    * 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);
   /*
    * 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);
   
   /*
  * io_argsNum() Parse and calculate number of arguments   * io_argsNum() Parse and calculate number of arguments
  * @csArgs = Input arguments line   * @csArgs = Input arguments line
  * @csDelim = Delimiter(s) for separate   * @csDelim = Delimiter(s) for separate
Line 249  int io_arrayMake(char * __restrict psArgs, int nargs,  Line 334  int io_arrayMake(char * __restrict psArgs, int nargs, 
 int io_MakeAV(const char * __restrict csArgs, const char *csDelim,   int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
                 char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);                  char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
   
   /*
    * io_sarrInit() - Create and initialize dynamic split-order array
    * @numItems = Number of Items
    * @segLen = Length of segment
    * return: NULL error, != NULL allocated memory for array
    */
   inline sarr_t *io_sarrInit(int numItems, int segLen);
   /*
    * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array
    * @parr = Array
    * return: none
    */
   inline void io_sarrDestroy(sarr_t ** __restrict parr);
   /*
    * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!!
    * @arr = Array
    * @newNumItems = Number of Items
    * return: -1 error, 0 ok
    */
   int io_sarrGrow(sarr_t * __restrict arr, int newNumItems);
   /*
    * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed
    * @arr = Array
    * return: -1 error, >-1 freed segments
    */
   inline int io_sarrVacuum(sarr_t * __restrict arr);
   #define io_sarrSize(_arr)               ((assert(_arr)), _arr->sarr_num)
   /*
    * io_sarrGet() - Get element from dynamic split-order array
    * @arr = Array
    * @idx = Index (warning 1st element is at position 1)
    * return: NULL not found, !=NULL element
    */
   inline void *io_sarrGet(sarr_t * __restrict arr, unsigned int idx);
   /*
    * io_sarrGet2() - Always get element from dynamic split-order array
    *      Function automatic grow array. Good use for Hash tables! 
    * @arr = Array
    * @idx = Index (warning 1st element is at position 1)
    * return: NULL not found, !=NULL element
    */
   void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx);
   /*
    * io_sarrSet() - Set element to dynamic split-order array
    * @arr = Array
    * @idx = Index (warning 1st element is at position 1)
    * @data = Value
    * return: NULL error or empty, !=NULL old value in element
    */
   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_sarr(_arr, _idx, _type)      (_type)io_sarrGet(_arr, _idx)
   
 /*  /*
    * io_CopyEnv() Copy environment to new environment array;
    * @oldenv = Environment array
    * return: NULL error; !=NULL Allocated new environment array(must be free)
   */
   char **io_CopyEnv(const char **oldenv);
   /*
    * io_ExecArgs() Build exec arguments from other array
    * @psProg = Program name for execute
    * @oldarg = Arguments array
    * return: NULL error; !=NULL Allocated execution array(must be free)
   */
   char **io_ExecArgs(const char *psProg, const char **oldarg);
   /*
    * io_FreeNullTerm() Free dynamic allocated null terminated array with strings
    * @arr = Pointer to array for free
    * return: none
   */
   inline void io_FreeNullTerm(char *** __restrict arr);
   
   /*
  * ioURLGet() Parse and get data from input URL   * ioURLGet() Parse and get data from input URL
  * @csURL = Input URL line   * @csURL = Input URL line
  * @url = Output parsed URL   * @url = Output parsed URL
Line 390  int ioCipher(unsigned char *pInput, int inLen, unsigne Line 547  int ioCipher(unsigned char *pInput, int inLen, unsigne
  * @nMode = Mode 0 - decrypting or 1 - encrypting   * @nMode = Mode 0 - decrypting or 1 - encrypting
  * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput   * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput
 */  */
int io_Blowfish(u_char *pInput, int inLen, u_char **ppOutput, u_char *pKey, u_char *pIV, int nMode);int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
                 unsigned char *pKey, unsigned char *pIV, int nMode);
   
   
 #endif  #endif
Removed from v.1.7.2.1  
changed lines
  Added in v.1.9.2.4

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