[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.5.2.3 and 1.7.2.2

version 1.5.2.3, 2011/02/10 19:34:52 version 1.7.2.2, 2011/04/19 21:43:18
Line 10 Line 10
 #define __AITIO_H  #define __AITIO_H
   
   
   #include <assert.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 99  char *ioRegexReplace(const char *csRegex, const char * Line 112  char *ioRegexReplace(const char *csRegex, const char *
 /*  /*
  * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"   * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
  * @csString = Input string   * @csString = Input string
  * @strLen = String length  
  * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()   * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()
 */  */
char *ioVarAst(const char *csString, int strLen);char *ioVarAst(const char *csString);
   
 /*  /*
  * io_Path2File() Parse and make path/filename pair   * io_Path2File() Parse and make path/filename pair
Line 115  char *ioVarAst(const char *csString, int strLen); Line 127  char *ioVarAst(const char *csString, int strLen);
 */  */
 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 186  inline unsigned char *io_Ch2Hex(unsigned char *psLine, Line 168  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_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 229  int ioXMLGet(const char *csXML, struct tagReqXML *xml) Line 294  int ioXMLGet(const char *csXML, struct tagReqXML *xml)
 */  */
 int ioMkDir(const char *csDir, int mode);  int ioMkDir(const char *csDir, int mode);
   
   /*
    * ioWatchDirLoop() Function for watching changes in directory and fire callback
    * @csDir = Full directory path
    * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create
    * return: -1 error, !=-1 ok, number of total signaled events
   */
   int ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp));
   
   
 /*  /*
  * io_rread() Raw VFS read function   * io_rread() Raw VFS read function
  * @fd = File handle   * @fd = File handle
Line 289  extern int io_Debug; Line 362  extern int io_Debug;
                                                                 __func__, __LINE__, ait##_GetErrno(), \                                                                  __func__, __LINE__, ait##_GetErrno(), \
                                                                 ait##_GetError()); \                                                                  ait##_GetError()); \
                                 } while (0)                                  } while (0)
   
   
   /* Crypto framework */
   
   /*
    * ioCipher() Cipher wrapper for all supported crypto algorythms
    * @pInput = input buffer
    * @inLen = input buffer len
    * @ppOutput = output allocated buffe, must be free after use
    * @Cipher = cipher engine, like EVP_bf_cbc() or etc...
    * @pKey = key
    * @pIV = IV, salt (8 bytes)
    * @nMode = Mode 0 - decrypting or 1 - encrypting
    * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput
   */
   int ioCipher(unsigned char *pInput, int inLen, unsigned char **ppOutput, const EVP_CIPHER *Cipher, 
                   unsigned char *pKey, unsigned char *pIV, int nMode);
   
   /*
    * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings
    * @pInput = input buffer
    * @inLen = input buffer len
    * @ppOutput = output allocated buffe, must be free after use
    * @pKey = key
    * @pIV = IV, salt (8 bytes)
    * @nMode = Mode 0 - decrypting or 1 - encrypting
    * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput
   */
   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.5.2.3  
changed lines
  Added in v.1.7.2.2

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