Diff for /libaitio/inc/aitio.h between versions 1.7 and 1.8

version 1.7, 2011/04/19 20:00:31 version 1.8, 2011/04/20 22:56:32
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
   
   
   #include <assert.h>
 #include <openssl/evp.h>  #include <openssl/evp.h>
   
   
   #define VACUUM_LEFT     1
   #define VACUUM_BETWEEN  2
   
   
   typedef struct _tagArray {
           int     arr_num;
           void    **arr_data;
   } array_t;
   
 typedef struct _tagURLItem {  typedef struct _tagURLItem {
         int     vallen;          int     vallen;
         char    *value;          char    *value;
Line 117  char *ioVarAst(const char *csString); Line 164  char *ioVarAst(const char *csString);
 */  */
 inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen,   inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, 
                 char * __restrict psFile, int fileLen);                  char * __restrict psFile, int fileLen);
 /*  
  * io_MakeAV() Parse and make attribute/value pair  
  * @csArgs = Input argument line  
  * @csDelim = Delimiter for separate  
  * @psAttr = Output Attribute  
  * @attrLen = Size of attribute array  
  * @psValue = Output Value, if ==NULL this element not present value or not wanted for return  
  * @valLen = Size of value array  
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items  
 */  
 inline int io_MakeAV(const char * __restrict csArgs, const char *csDelim,   
                 char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);  
 /*  
  * io_SizeArray() Parse and calculate size of array  
  * @csArgs = Input arguments line  
  * @csDelim = Delimiter(s) for separate  
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of items  
 */  
 inline int io_SizeArray(const char *csArgs, const char *csDelim);  
 /*  
  * io_MakeArray() Parse and make array of arguments values ...   
  *      (input string will be modified! and output array must be free)  
  * @psArgs = Input arguments line, after execute string is modified!!!  
  * @csDelim = Delimiter(s) for separate  
  * @args = Output array of arguments ... (must be free() after procced function!)  
  * @nargs = Maximum requested count of arguments from input string psArgs  
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items  
 */  
 inline int io_MakeArray(char * __restrict psArgs, const char *csDelim,   
                 char *** __restrict args, int nargs);  
   
 /*  /*
  * io_UnquotStr() Remove quots from input text string    * io_UnquotStr() Remove quots from input text string 
Line 188  inline unsigned char *io_Ch2Hex(unsigned char *psLine, Line 205  inline unsigned char *io_Ch2Hex(unsigned char *psLine,
 inline char *io_Hex2Ch(unsigned char *psLine, int lineLen);  inline char *io_Hex2Ch(unsigned char *psLine, int lineLen);
   
 /*  /*
    * io_arrayInit() - Create and initialize dynamic array
    * @numItems = Number of Items
    * return: NULL error, != NULL allocated memory for array
    */
   inline array_t *io_arrayInit(int numItems);
   /*
    * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array
    * @parr = Array
    * return: none
    */
   inline void io_arrayDestroy(array_t ** __restrict parr);
   /*
    * io_arrayFree() - Free all data in dynamic array
    *      (WARNING! If assign static array dont use this!!!)
    * @arr = Array
    * return: none
    */
   inline void io_arrayFree(array_t * __restrict arr);
   /*
    * io_arrayLen() - Get last used element in dynamic array (array Length)
    * @arr = Array
    * return: -1 error, 0 empty or >0 position of last used element
    */
   inline int io_arrayLen(array_t * __restrict arr);
   /*
    * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!!
    * @arr = Array
    * @newNumItems = Number of Items
    * return: -1 error, 0 ok
    */
   int io_arrayGrow(array_t * __restrict arr, int newNumItems);
   /*
    * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted
    * @arr = Array
    * @fromWhere = 1 begin, 2 ALL empty elements
    * return: -1 error, 0 ok
    */
   int io_arrayVacuum(array_t * __restrict arr, int fromWhere);
   
   #define io_arraySize(_arr)              ((assert(_arr)), _arr->arr_num)
   
   #define io_arrayGet(_arr, _d, _type)    ((assert(_arr && _arr->arr_num > _d)), \
                                                   ((_type) *(_arr->arr_data + _d)))
   #define io_arraySet(_arr, _d, _ptr)     do { \
                                                   assert(_arr && _arr->arr_num > _d); \
                                                   *(_arr->arr_data + _d) = (void*) _ptr; \
                                           } 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
    * @csArgs = Input arguments line
    * @csDelim = Delimiter(s) for separate
    * return: 0 error format; -1 error:: can`t read; >0 ok, number of items
    */
   inline int io_argsNum(const char *csArgs, const char *csDelim);
   
   /*
    * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!! 
    *      and output array must be free with io_arrayDestroy() after use!)
    * @psArgs = Input arguments line, after execute string is modified!!!
    * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs
    * @csDelim = Delimiter(s) for separate
    * @parr = Output array of arguments ... (must be free with io_arrayDestroy() after use!)
    * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
    */
   int io_arrayMake(char * __restrict psArgs, int nargs, const char *csDelim, 
                   array_t ** __restrict parr);
   
   /*
    * io_MakeAV() Parse and make attribute/value pair
    * @csArgs = Input argument line
    * @csDelim = Delimiter for separate
    * @psAttr = Output Attribute
    * @attrLen = Size of attribute array
    * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
    * @valLen = Size of value array
    * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
   */
   int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
                   char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
   
   
   /*
  * 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 327  int ioCipher(unsigned char *pInput, int inLen, unsigne Line 443  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  
changed lines
  Added in v.1.8


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