[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.14 and 1.15

version 1.14, 2012/02/02 21:32:42 version 1.15, 2012/03/15 01:52:22
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, 2011Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
         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 78  typedef struct _tagArray { Line 78  typedef struct _tagArray {
         void    **arr_data;          void    **arr_data;
 } array_t;  } array_t;
   
 /* URL staff ... */  
   
 typedef struct _tagURLItem {  
         int     vallen;  
         char    *value;  
 } url_Item_t;  
   
 struct tagIOURL {  
         unsigned char   url_line[BUFSIZ];  
   
         url_Item_t      url_tech;  
         url_Item_t      url_user;  
         url_Item_t      url_pass;  
         url_Item_t      url_host;  
         url_Item_t      url_port;  
         url_Item_t      url_path;  
         url_Item_t      url_args;  
   
         char            *url_reserved;  
 };  
   
 struct tagReqXML {  
         unsigned char   xml_line[BUFSIZ];  
   
         url_Item_t      xml_namespace;  
         union {  
                 url_Item_t      container;  
                 url_Item_t      path;  
         }               xml_node;  
         url_Item_t      xml_data;  
         url_Item_t      xml_attribute;  
         url_Item_t      xml_value;  
 };  
   
 /* AIT RPC variables and managment */  /* AIT RPC variables and managment */
   
 typedef enum {  typedef enum {
Line 149  typedef struct { Line 115  typedef struct {
 #define AIT_TYPE(_vl)                   ((ait_type_t) (_vl)->val_type)  #define AIT_TYPE(_vl)                   ((ait_type_t) (_vl)->val_type)
 #define AIT_LEN(_vl)                    (_vl)->val_len  #define AIT_LEN(_vl)                    (_vl)->val_len
 #define AIT_RAW(_vl)                    (_vl)->val.net  #define AIT_RAW(_vl)                    (_vl)->val.net
   #define AIT_VOID(_vl)                   (_vl)->val.ptr
 #define AIT_BLOB_CHUNKS(_vl, _n)        (assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0)  #define AIT_BLOB_CHUNKS(_vl, _n)        (assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0)
 #define AIT_ISEMPTY(_vl)                (assert((_vl)), AIT_TYPE((_vl)) == empty)  #define AIT_ISEMPTY(_vl)                (assert((_vl)), AIT_TYPE((_vl)) == empty)
   
#define AIT_GET_LIKE(_vl, _type)        (assert((_vl)), (_type) (_vl)->val.net)#define AIT_GET_LIKE(_vl, _type)        (assert((_vl)), (_type) (_vl)->val.ptr)
   
 #define AIT_GET_PTR(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr)  #define AIT_GET_PTR(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr)
 #define AIT_GET_PTR2(_vl)               (assert((_vl)), (_vl)->val.ptr)  
 #define AIT_GET_BUF(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer)  #define AIT_GET_BUF(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer)
 #define AIT_GET_STR(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string)  #define AIT_GET_STR(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string)
 #define AIT_GET_BLOB(_vl)               (assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob)  #define AIT_GET_BLOB(_vl)               (assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob)
Line 269  typedef union { Line 235  typedef union {
 } io_sockaddr_t;  } io_sockaddr_t;
   
   
   #define io_align(x, a)          (((x) + (a)) & ~(a))
   
   
 // io_GetErrno() Get error code of last operation  // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();  inline int io_GetErrno();
 // io_GetError() Get error text of last operation  // io_GetError() Get error text of last operation
Line 436  char *ioRegexReplace(const char *csRegex, const char * Line 405  char *ioRegexReplace(const char *csRegex, const char *
 char *ioStrAst(const char *csString);  char *ioStrAst(const char *csString);
   
 /*  /*
  * io_Path2File() Parse and make path/filename pair  
  * @csArgs = Input argument line  
  * @psPath = Output Path, if ==NULL path not returned  
  * @pathLen = Size of path array  
  * @psFile = Output File  
  * @fileLen = Size of file array  
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items  
 */  
 inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen,   
                 char * __restrict psFile, int fileLen);  
   
 /*  
  * io_UnquotStr() Remove quots from input text string    * io_UnquotStr() Remove quots from input text string 
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted string   * return: 0 nothing to do; 1 successful unquoted string
Line 487  inline unsigned char *io_Ch2Hex(unsigned char *psLine, Line 444  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_Path2File() - Parse and make path/filename pair
    *
    * @csArgs = Input argument line
    * @psPath = Output Path, if ==NULL path not returned
    * @pathLen = Size of path array
    * @psFile = Output File
    * @fileLen = Size of file array
    * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
    */
   inline int
   io_Path2File(const char * __restrict csArgs, char * __restrict psPath, 
                   int pathLen, char * __restrict psFile, int fileLen);
   
   /*
  * io_arrayInit() - Create and initialize dynamic array   * io_arrayInit() - Create and initialize dynamic array
  * @numItems = Number of Items   * @numItems = Number of Items
  * return: NULL error, != NULL allocated memory for array   * return: NULL error, != NULL allocated memory for array
Line 724  char **io_ExecArgs(const char *psProg, const char **ol Line 695  char **io_ExecArgs(const char *psProg, const char **ol
  * return: none   * return: none
 */  */
 inline void io_FreeNullTerm(char *** __restrict arr);  inline void io_FreeNullTerm(char *** __restrict arr);
   
 /*  
  * ioURLGet() Parse and get data from input URL  
  * @csURL = Input URL line  
  * @url = Output parsed URL  
  * return: 0 error format not find tech:// and return URL like path;   
                 -1 error:: can`t read; >0 ok, up bits for known elements  
 */  
 int ioURLGet(const char *csURL, struct tagIOURL *url);  
 /*  
  * ioURLGetValue() Get value from parsed URL  
  * @url = Input parsed URL  
  * @csAttr = Attribute for search  
  * @psValue = Return value of attribute, if ==NULL only check for existence of attribute  
  * @valLen = Size of psValue array  
  * return: 0 error attribute not find; -1 error:: can`t read; >0 ok, find at position  
 */  
 int ioURLGetValue(struct tagIOURL *url, const char *csAttr, char * __restrict psValue, int valLen);  
 /*  
  * ioURLGetFile() Get file from parsed URL  
  * @url = Input parsed URL  
  * @psValue = Return filename, if not specified file in url path, replace with /  
  * @valLen = Size of psValue array  
  * return: -1 error:: can`t read; 0 ok  
 */  
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);  
   
   
 /*  
  * ioXMLGet() Parse and get data from input XML request string [ns:]container[|attribute[=value]][?data]  
  * @csXML = Input XML request line  
  * @xml = Output parsed XML request  
  * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits  
 */  
 int ioXMLGet(const char *csXML, struct tagReqXML *xml);  
   
   
 /*  /*
  * ioMkDir() Function for racursive directory creation and validation   * ioMkDir() Function for racursive directory creation and validation
Removed from v.1.14  
changed lines
  Added in v.1.15

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