[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.15 and 1.16

version 1.15, 2012/03/15 01:52:22 version 1.16, 2012/03/29 01:31:33
Line 81  typedef struct _tagArray { Line 81  typedef struct _tagArray {
 /* AIT RPC variables and managment */  /* AIT RPC variables and managment */
   
 typedef enum {  typedef enum {
        empty, ptr,                     /* empty -> variable is not set; ptr -> void* */        empty, ptr, data,           /* empty -> variable is not set; ptr -> void*; data -> data after struct  */
         buffer, string, blob,           /* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */          buffer, string, blob,           /* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */
         f32, f64,                       /* float -> f32; double -> f64 */          f32, f64,                       /* float -> f32; double -> f64 */
         u8, u16, u32, u64,              /* unsigned integers ... */          u8, u16, u32, u64,              /* unsigned integers ... */
Line 90  typedef enum { Line 90  typedef enum {
   
 typedef struct {  typedef struct {
         uint8_t         val_type;          uint8_t         val_type;
        uint8_t         val_pad[3];        uint8_t         val_pad;
         uint16_t        val_hash;
         uint32_t        val_len;          uint32_t        val_len;
         union {          union {
                 uint64_t        net;                  uint64_t        net;
Line 110  typedef struct { Line 111  typedef struct {
                 int32_t         i32;                  int32_t         i32;
                 int64_t         i64;                  int64_t         i64;
         } val;          } val;
           uint8_t         val_data[0];
 } __packed ait_val_t;  } __packed ait_val_t;
   
 #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_HASH(_vl)                   (_vl)->val_hash
 #define AIT_RAW(_vl)                    (_vl)->val.net  #define AIT_RAW(_vl)                    (_vl)->val.net
 #define AIT_VOID(_vl)                   (_vl)->val.ptr  #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)
Line 122  typedef struct { Line 125  typedef struct {
 #define AIT_GET_LIKE(_vl, _type)        (assert((_vl)), (_type) (_vl)->val.ptr)  #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_DATA(_vl)               (assert((_vl)), assert(AIT_TYPE((_vl)) == data), (_vl)->val_data)
 #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 136  typedef struct { Line 140  typedef struct {
 #define AIT_GET_F32(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)  #define AIT_GET_F32(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
 #define AIT_GET_F64(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)  #define AIT_GET_F64(_vl)                (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)
   
   #define AIT_SET_DATA(_vl, _p, _len)     do { ait_val_t *__val = (_vl); \
                                                   __val = realloc(__val, sizeof(ait_val_t) + _len); \
                                                   if (__val) { \
                                                           __val->val_type = data; AIT_LEN(__val) = _len; \
                                                           if ((_p)) \
                                                                   memcpy(__val->val_data, (_p), _len); \
                                                   } \
                                                   (_vl) = __val; \
                                           } while (0);
 #define AIT_SET_PTR(_vl, _p, _len)      do { ait_val_t *__val = (_vl); assert(__val); \  #define AIT_SET_PTR(_vl, _p, _len)      do { ait_val_t *__val = (_vl); assert(__val); \
                                                 __val->val_type = ptr; AIT_LEN(__val) = _len; \                                                  __val->val_type = ptr; AIT_LEN(__val) = _len; \
                                                 __val->val.ptr = _p; } while (0)                                                  __val->val.ptr = _p; } while (0)
Line 199  typedef struct { Line 212  typedef struct {
                                                 AIT_LEN(__val) = sizeof(double); } while (0)                                                  AIT_LEN(__val) = sizeof(double); } while (0)
   
                                         /* if attribute zeroCopy is set not execute free() */                                          /* if attribute zeroCopy is set not execute free() */
#define AIT_FREE_VAL(_vl)               do { ait_val_t *__val = (ait_val_t*) (_vl); assert(__val); \#define AIT_FREE_VAL(_vl)               do { ait_val_t *__val = (_vl); assert(__val); \
                                                switch (__val->val_type) { \                                                switch (AIT_TYPE(__val)) { \
                                                         case buffer: \                                                          case buffer: \
                                                                 if (__val->val.buffer) { \                                                                  if (__val->val.buffer) { \
                                                                         free(__val->val.buffer); \                                                                          free(__val->val.buffer); \
Line 246  inline const char *io_GetError(); Line 259  inline const char *io_GetError();
   
 /*  /*
  * io_ether_ntoa() Convert ethernet address to string   * io_ether_ntoa() Convert ethernet address to string
    *
  * @n = ethernet address structure, like struct ether_addr   * @n = ethernet address structure, like struct ether_addr
  * @a = string   * @a = string
  * @len = string length   * @len = string length
Line 254  inline const char *io_GetError(); Line 268  inline const char *io_GetError();
 inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);  inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);
 /*  /*
  * io_ether_aton() Convert string to ethernet address   * io_ether_aton() Convert string to ethernet address
    *
  * @a = string   * @a = string
  * @e = ethernet address structure, like struct ether_addr   * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure   * return: NULL error or !=NULL ethernet address structure
Line 261  inline char *io_ether_ntoa(const struct io_ether_addr  Line 276  inline char *io_ether_ntoa(const struct io_ether_addr 
 inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);  inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
 /*  /*
  * io_n2port() Extract port from network structure   * io_n2port() Extract port from network structure
    *
  * @addr = Address   * @addr = Address
  * return: 0 not supported family type or port number   * return: 0 not supported family type or port number
  */   */
 inline u_short io_n2port(io_sockaddr_t * __restrict addr);  inline u_short io_n2port(io_sockaddr_t * __restrict addr);
 /*  /*
  * io_n2addr() Extract address from network structure   * io_n2addr() Extract address from network structure
    *
  * @addr = Address   * @addr = Address
  * @val = Value for store string address   * @val = Value for store string address
  * return: NULL error or !=NULL string address from val   * return: NULL error or !=NULL string address from val
Line 274  inline u_short io_n2port(io_sockaddr_t * __restrict ad Line 291  inline u_short io_n2port(io_sockaddr_t * __restrict ad
 const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val);  const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val);
 /*  /*
  * io_gethostbyname() Get host and port and make network structure   * io_gethostbyname() Get host and port and make network structure
    *
  * @psHost = Hostname   * @psHost = Hostname
  * @port = Port   * @port = Port
  * @addr = Network address structure   * @addr = Network address structure
Line 284  io_sockaddr_t *io_gethostbyname(const char *psHost, un Line 302  io_sockaddr_t *io_gethostbyname(const char *psHost, un
   
 /*  /*
  * io_vars2buffer() Marshaling data from array with variables to buffer   * io_vars2buffer() Marshaling data from array with variables to buffer
    *
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vars = Variable array   * @vars = Variable array
Line 292  io_sockaddr_t *io_gethostbyname(const char *psHost, un Line 311  io_sockaddr_t *io_gethostbyname(const char *psHost, un
 int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars);  int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars);
 /*  /*
  * io_buffer2vars() De-marshaling data from buffer to array with variables   * io_buffer2vars() De-marshaling data from buffer to array with variables
    *
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vnum = Number of variables into buffer   * @vnum = Number of variables into buffer
Line 302  int io_vars2buffer(unsigned char *buf, int buflen, arr Line 322  int io_vars2buffer(unsigned char *buf, int buflen, arr
 array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy);  array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 /*  /*
  * io_vars2map() Marshaling data from array with variables to memory map   * io_vars2map() Marshaling data from array with variables to memory map
    *
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vars = Variable array   * @vars = Variable array
Line 310  array_t *io_buffer2vars(unsigned char *buf, int buflen Line 331  array_t *io_buffer2vars(unsigned char *buf, int buflen
 int io_vars2map(unsigned char *buf, int buflen, array_t *vars);  int io_vars2map(unsigned char *buf, int buflen, array_t *vars);
 /*  /*
  * io_map2vars() De-marshaling data from memory map to array with variables   * io_map2vars() De-marshaling data from memory map to array with variables
    *
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vnum = Number of variables into buffer   * @vnum = Number of variables into buffer
Line 321  array_t *io_map2vars(unsigned char *buf, int buflen, i Line 343  array_t *io_map2vars(unsigned char *buf, int buflen, i
   
 /*  /*
  * io_allocVar() Allocate memory for variable   * io_allocVar() Allocate memory for variable
    *
  * return: NULL error or new variable, after use free variable with io_freeVar()   * return: NULL error or new variable, after use free variable with io_freeVar()
  */   */
 inline ait_val_t *io_allocVar(void);  inline ait_val_t *io_allocVar(void);
 /*  /*
  * io_freeVar() Free allocated memory for variable   * io_freeVar() Free allocated memory for variable
    *
  * @val = Variable   * @val = Variable
  * return: none   * return: none
  */   */
 inline void io_freeVar(ait_val_t * __restrict val);  inline void io_freeVar(ait_val_t * __restrict val);
 /*  /*
  * io_allocVars() Allocate ait_val_t array   * io_allocVars() Allocate ait_val_t array
    *
  * @varnum = Number of variables   * @varnum = Number of variables
  * return: =NULL error or !=NULL allocated array   * return: =NULL error or !=NULL allocated array
  */   */
 inline array_t *io_allocVars(int varnum);  inline array_t *io_allocVars(int varnum);
 /*  /*
  * io_clrVars() Clear ait_val_t elements from array   * io_clrVars() Clear ait_val_t elements from array
    *
  * @vars = Variable array   * @vars = Variable array
  * return: -1 error or size of array   * return: -1 error or size of array
  */   */
 inline int io_clrVars(array_t * __restrict vars);  inline int io_clrVars(array_t * __restrict vars);
 /*  /*
  * io_freeVars() Free ait_val_t array   * io_freeVars() Free ait_val_t array
    *
  * @vars = Variable array   * @vars = Variable array
  * return: none   * return: none
  */   */
Line 352  inline void io_freeVars(array_t ** __restrict vars); Line 379  inline void io_freeVars(array_t ** __restrict vars);
   
 /*  /*
  * ioPromptRead() Read data from input h[0] with prompt to output h[1]   * ioPromptRead() Read data from input h[0] with prompt to output h[1]
    *
  * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout   * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
  * @csPrompt = Prompt before input, may be NULL   * @csPrompt = Prompt before input, may be NULL
  * @psData = Readed data   * @psData = Readed data
Line 361  inline void io_freeVars(array_t ** __restrict vars); Line 389  inline void io_freeVars(array_t ** __restrict vars);
 int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen);  int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen);
 /*  /*
  * ioPromptPassword() Read password from input h[0] with prompt to output h[1]   * ioPromptPassword() Read password from input h[0] with prompt to output h[1]
    *
  * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout   * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
  * @csPrompt = Prompt before input, may be NULL   * @csPrompt = Prompt before input, may be NULL
  * @psPass = Readed password   * @psPass = Readed password
Line 372  int ioPromptPassword(int *h, const char *csPrompt, cha Line 401  int ioPromptPassword(int *h, const char *csPrompt, cha
   
 /*  /*
  * ioRegexVerify() Function for verify data match in regex expression   * ioRegexVerify() Function for verify data match in regex expression
    *
  * @csRegex = Regulare expression pattern   * @csRegex = Regulare expression pattern
  * @csData = Data for check and verify   * @csData = Data for check and verify
  * @startPos = Return start positions   * @startPos = Return start positions
Line 381  int ioPromptPassword(int *h, const char *csPrompt, cha Line 411  int ioPromptPassword(int *h, const char *csPrompt, cha
 const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos);  const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos);
 /*  /*
  * ioRegexGet() Function for get data match in regex expression   * ioRegexGet() Function for get data match in regex expression
    *
  * @csRegex = Regulare expression pattern   * @csRegex = Regulare expression pattern
  * @csData = Data from get   * @csData = Data from get
  * @psString = Returned string if match   * @psString = Returned string if match
Line 390  const char *ioRegexVerify(const char *csRegex, const c Line 421  const char *ioRegexVerify(const char *csRegex, const c
 int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen);  int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen);
 /*  /*
  * ioRegexReplace() Function for replace data match in regex expression with newdata   * ioRegexReplace() Function for replace data match in regex expression with newdata
    *
  * @csRegex = Regulare expression pattern   * @csRegex = Regulare expression pattern
  * @csData = Source data   * @csData = Source data
  * @csNew = Data for replace   * @csNew = Data for replace
Line 399  char *ioRegexReplace(const char *csRegex, const char * Line 431  char *ioRegexReplace(const char *csRegex, const char *
   
 /*  /*
  * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"   * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
    *
  * @csString = Input string   * @csString = Input string
  * 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()
 */  */
Line 406  char *ioStrAst(const char *csString); Line 439  char *ioStrAst(const char *csString);
   
 /*  /*
  * 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
 */  */
 inline int io_UnquotStr(unsigned char * __restrict psLine);  inline int io_UnquotStr(unsigned char * __restrict psLine);
 /*  /*
  * io_LTrimStr() Remove left whitespaces from text string   * io_LTrimStr() Remove left whitespaces from text string
    *
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
 inline int io_LTrimStr(unsigned char * __restrict psLine);  inline int io_LTrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_RTrimStr() Remove right whitespaces from text string   * io_RTrimStr() Remove right whitespaces from text string
    *
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
 inline int io_RTrimStr(unsigned char * __restrict psLine);  inline int io_RTrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_TrimStr() Remove left and right whitespaces from text string   * io_TrimStr() Remove left and right whitespaces from text string
    *
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * return: 0 nothing to do; !=0 Removed bytes
 */  */
 inline int io_TrimStr(unsigned char * __restrict psLine);  inline int io_TrimStr(unsigned char * __restrict psLine);
 /*  /*
  * io_Ch2Hex() Convert from Char string to Hex string   * io_Ch2Hex() Convert from Char string to Hex string
    *
  * @psLine = Text string   * @psLine = Text string
  * @lineLen = Length of Text string   * @lineLen = Length of Text string
  * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)   * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)
Line 437  inline int io_TrimStr(unsigned char * __restrict psLin Line 475  inline int io_TrimStr(unsigned char * __restrict psLin
 inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen);  inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen);
 /*  /*
  * io_Hex2Ch() Convert from Hex string to Char string   * io_Hex2Ch() Convert from Hex string to Char string
    *
  * @psLine = Text string   * @psLine = Text string
  * @lineLen = Length of Text string   * @lineLen = Length of Text string
  * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)   * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)
Line 459  io_Path2File(const char * __restrict csArgs, char * __ Line 498  io_Path2File(const char * __restrict csArgs, char * __
   
 /*  /*
  * 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
  */   */
 inline array_t *io_arrayInit(int numItems);  inline array_t *io_arrayInit(int numItems);
 /*  /*
  * io_arrayDestroy() - Free and destroy dynamic array   * io_arrayDestroy() - Free and destroy dynamic array
    *
  * @parr = Array   * @parr = Array
  * return: none   * return: none
  */   */
Line 472  inline void io_arrayDestroy(array_t ** __restrict parr Line 513  inline void io_arrayDestroy(array_t ** __restrict parr
 /*  /*
  * io_arrayFree() - Free all data in dynamic array items   * 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   * io_arrayFrom() - Create and fill array from array with pointers
    *
  * @pargv = 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 new array   * return: NULL error, != NULL allocated new array
Line 485  inline void io_arrayFree(array_t * __restrict arr); Line 528  inline void io_arrayFree(array_t * __restrict arr);
 inline array_t *io_arrayFrom(const char *** __restrict pargv, 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, NULL terminated   * 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);
 /*  /*
  * 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   * io_arrayConcat() Concat source array to destination array
    *
  * @dest = Destination array   * @dest = Destination array
  * @src = Source array   * @src = Source array
  * return: -1 error; >0 new count of destination array   * return: -1 error; >0 new count of destination array
Line 504  inline int io_arrayLen(array_t * __restrict arr); Line 550  inline int io_arrayLen(array_t * __restrict arr);
 int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src);  int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src);
 /*  /*
  * io_arrayCopy() Copy source array to destination array   * io_arrayCopy() Copy source array to destination array
    *
  * @dest = Destination array, after use free with io_arrayDestroy()   * @dest = Destination array, after use free with io_arrayDestroy()
  * @src = Source array   * @src = Source array
  * return: -1 error; >0 count of destination array   * return: -1 error; >0 count of destination array
Line 511  int io_arrayConcat(array_t * __restrict dest, array_t  Line 558  int io_arrayConcat(array_t * __restrict dest, array_t 
 int io_arrayCopy(array_t ** __restrict dest, array_t * __restrict src);  int io_arrayCopy(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
  * @freeShrink = Free elements before shrink array   * @freeShrink = Free elements before shrink array
Line 519  int io_arrayCopy(array_t ** __restrict dest, array_t * Line 567  int io_arrayCopy(array_t ** __restrict dest, array_t *
 int io_arrayGrow(array_t * __restrict arr, int newNumItems, int freeShrink);  int io_arrayGrow(array_t * __restrict arr, int newNumItems, int freeShrink);
 /*  /*
  * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted   * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted
    *
  * @arr = Array   * @arr = Array
  * @fromWhere = 1 begin, 2 ALL empty elements   * @fromWhere = 1 begin, 2 ALL empty elements
  * return: -1 error, 0 ok   * return: -1 error, 0 ok
Line 545  int io_arrayVacuum(array_t * __restrict arr, int fromW Line 594  int io_arrayVacuum(array_t * __restrict arr, int fromW
   
 /*  /*
  * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array   * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array
    *
  * @arr = Array   * @arr = Array
  * @n = Position   * @n = Position
  * @data = Element, if set NULL GET element at position or !=NULL PUT element at position   * @data = Element, if set NULL GET element at position or !=NULL PUT element at position
Line 553  int io_arrayVacuum(array_t * __restrict arr, int fromW Line 603  int io_arrayVacuum(array_t * __restrict arr, int fromW
 inline void *io_arrayElem(array_t * __restrict arr, int n, void *data);  inline void *io_arrayElem(array_t * __restrict arr, int n, void *data);
 /*  /*
  * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position   * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position
    *
  * @arr = Array   * @arr = Array
  * @data = Element, if set NULL return only first empty position   * @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   * return: -1 not found empty position, array is full!, >-1 return position of stored element into array
Line 560  inline void *io_arrayElem(array_t * __restrict arr, in Line 611  inline void *io_arrayElem(array_t * __restrict arr, in
 inline int io_arrayPush(array_t * __restrict arr, void **data);  inline int io_arrayPush(array_t * __restrict arr, void **data);
 /*  /*
  * 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 last used 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
Line 569  inline int io_arrayPop(array_t * __restrict arr, void  Line 621  inline int io_arrayPop(array_t * __restrict arr, void 
   
 /*  /*
  * 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
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of items   * return: 0 error format; -1 error:: can`t read; >0 ok, number of items
Line 578  inline int io_argsNum(const char *csArgs, const char * Line 631  inline int io_argsNum(const char *csArgs, const char *
 /*  /*
  * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!!    * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!! 
  *      and output array must be free with io_arrayDestroy() after use!)   *      and output array must be free with io_arrayDestroy() after use!)
    *
  * @psArgs = Input arguments line, after execute string is modified!!!   * @psArgs = Input arguments line, after execute string is modified!!!
  * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs   * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs
  * @csDelim = Delimiter(s) for separate   * @csDelim = Delimiter(s) for separate
Line 589  int io_arrayMake(char * __restrict psArgs, int nargs,  Line 643  int io_arrayMake(char * __restrict psArgs, int nargs, 
   
 /*  /*
  * io_MakeAV() Parse and make attribute/value pair   * io_MakeAV() Parse and make attribute/value pair
    *
  * @csArgs = Input argument line   * @csArgs = Input argument line
  * @csDelim = Delimiter for separate   * @csDelim = Delimiter for separate
  * @psAttr = Output Attribute   * @psAttr = Output Attribute
Line 602  int io_MakeAV(const char * __restrict csArgs, const ch Line 657  int io_MakeAV(const char * __restrict csArgs, const ch
   
 /*  /*
  * io_sarrInit() - Create and initialize dynamic split-order array   * io_sarrInit() - Create and initialize dynamic split-order array
    *
  * @numItems = Number of Items   * @numItems = Number of Items
  * @segLen = Length of segment   * @segLen = Length of segment
  * return: NULL error, != NULL allocated memory for array   * return: NULL error, != NULL allocated memory for array
Line 609  int io_MakeAV(const char * __restrict csArgs, const ch Line 665  int io_MakeAV(const char * __restrict csArgs, const ch
 inline sarr_t *io_sarrInit(int numItems, int segLen);  inline sarr_t *io_sarrInit(int numItems, int segLen);
 /*  /*
  * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array   * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array
    *
  * @parr = Array   * @parr = Array
  * return: none   * return: none
  */   */
 inline void io_sarrDestroy(sarr_t ** __restrict parr);  inline void io_sarrDestroy(sarr_t ** __restrict parr);
 /*  /*
  * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!!   * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!!
    *
  * @arr = Array   * @arr = Array
  * @newNumItems = Number of Items   * @newNumItems = Number of Items
  * return: -1 error, 0 ok   * return: -1 error, 0 ok
Line 622  inline void io_sarrDestroy(sarr_t ** __restrict parr); Line 680  inline void io_sarrDestroy(sarr_t ** __restrict parr);
 int io_sarrGrow(sarr_t * __restrict arr, int newNumItems);  int io_sarrGrow(sarr_t * __restrict arr, int newNumItems);
 /*  /*
  * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed   * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed
    *
  * @arr = Array   * @arr = Array
  * return: -1 error, >-1 freed segments   * return: -1 error, >-1 freed segments
  */   */
Line 630  inline int io_sarrVacuum(sarr_t * __restrict arr); Line 689  inline int io_sarrVacuum(sarr_t * __restrict arr);
 #define io_sarrSeg(_arr)                (assert((_arr)), (_arr)->sarr_seg)  #define io_sarrSeg(_arr)                (assert((_arr)), (_arr)->sarr_seg)
 /*  /*
  * io_sarrCopy() Copy source split array to destination split array   * io_sarrCopy() Copy source split array to destination split array
    *
  * @dest = Destination split array, after use free with io_sarrDestroy()   * @dest = Destination split array, after use free with io_sarrDestroy()
  * @src = Source split array   * @src = Source split array
  * return: -1 error; >0 count of destination split array   * return: -1 error; >0 count of destination split array
Line 637  inline int io_sarrVacuum(sarr_t * __restrict arr); Line 697  inline int io_sarrVacuum(sarr_t * __restrict arr);
 int io_sarrCopy(sarr_t ** __restrict dest, sarr_t * __restrict src);  int io_sarrCopy(sarr_t ** __restrict dest, sarr_t * __restrict src);
 /*  /*
  * io_sarrGet() - Get element from dynamic split-order array   * io_sarrGet() - Get element from dynamic split-order array
    *
  * @arr = Array   * @arr = Array
  * @idx = Index (warning 1st element is at position 1)   * @idx = Index (warning 1st element is at position 1)
  * return: NULL not found, !=NULL element   * return: NULL not found, !=NULL element
Line 645  inline void *io_sarrGet(sarr_t * __restrict arr, unsig Line 706  inline void *io_sarrGet(sarr_t * __restrict arr, unsig
 /*  /*
  * io_sarrGet2() - Always get element from dynamic split-order array   * io_sarrGet2() - Always get element from dynamic split-order array
  *      Function automatic grow array. Good use for Hash tables!    *      Function automatic grow array. Good use for Hash tables! 
    *
  * @arr = Array   * @arr = Array
  * @idx = Index (warning 1st element is at position 1)   * @idx = Index (warning 1st element is at position 1)
  * return: NULL not found, !=NULL element   * return: NULL not found, !=NULL element
Line 652  inline void *io_sarrGet(sarr_t * __restrict arr, unsig Line 714  inline void *io_sarrGet(sarr_t * __restrict arr, unsig
 void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx);  void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx);
 /*  /*
  * io_sarrSet() - Set element to dynamic split-order array   * io_sarrSet() - Set element to dynamic split-order array
    *
  * @arr = Array   * @arr = Array
  * @idx = Index (warning 1st element is at position 1)   * @idx = Index (warning 1st element is at position 1)
  * @data = Value   * @data = Value
Line 662  inline void *io_sarrSet(sarr_t * __restrict arr, unsig Line 725  inline void *io_sarrSet(sarr_t * __restrict arr, unsig
 #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   * io_sarr2array() - Convert from split-order array to dynamic array
    *
  * @sa = split array   * @sa = split array
  * @sarrFree = after convert split array !=0 will be destroyed sarray   * @sarrFree = after convert split array !=0 will be destroyed sarray
  * return: NULL error or != NULL new array   * return: NULL error or != NULL new array
Line 669  inline void *io_sarrSet(sarr_t * __restrict arr, unsig Line 733  inline void *io_sarrSet(sarr_t * __restrict arr, unsig
 array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree);  array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree);
 /*  /*
  * io_array2sarr() - Convert from dynamic array to split-order array   * io_array2sarr() - Convert from dynamic array to split-order array
    *
  * @a = array   * @a = array
  * @segLen = Length of segment   * @segLen = Length of segment
  * @arrFree = after convert array !=0 will be destroyed   * @arrFree = after convert array !=0 will be destroyed
Line 678  sarr_t *io_array2sarr(array_t ** __restrict a, int seg Line 743  sarr_t *io_array2sarr(array_t ** __restrict a, int seg
   
 /*  /*
  * io_CopyEnv() Copy environment to new environment array;   * io_CopyEnv() Copy environment to new environment array;
    *
  * @oldenv = Environment array   * @oldenv = Environment array
  * return: NULL error; !=NULL Allocated new environment array(must be free)   * return: NULL error; !=NULL Allocated new environment array(must be free)
 */  */
 char **io_CopyEnv(const char **oldenv);  char **io_CopyEnv(const char **oldenv);
 /*  /*
  * io_ExecArgs() Build exec arguments from other array   * io_ExecArgs() Build exec arguments from other array
    *
  * @psProg = Program name for execute   * @psProg = Program name for execute
  * @oldarg = Arguments array   * @oldarg = Arguments array
  * return: NULL error; !=NULL Allocated execution array(must be free)   * return: NULL error; !=NULL Allocated execution array(must be free)
Line 691  char **io_CopyEnv(const char **oldenv); Line 758  char **io_CopyEnv(const char **oldenv);
 char **io_ExecArgs(const char *psProg, const char **oldarg);  char **io_ExecArgs(const char *psProg, const char **oldarg);
 /*  /*
  * io_FreeNullTerm() Free dynamic allocated null terminated array with strings   * io_FreeNullTerm() Free dynamic allocated null terminated array with strings
    *
  * @arr = Pointer to array for free   * @arr = Pointer to array for free
  * return: none   * return: none
 */  */
Line 698  inline void io_FreeNullTerm(char *** __restrict arr); Line 766  inline void io_FreeNullTerm(char *** __restrict arr);
   
 /*  /*
  * ioMkDir() Function for racursive directory creation and validation   * ioMkDir() Function for racursive directory creation and validation
    *
  * @csDir = Full directory path   * @csDir = Full directory path
  * @mode = Mode for directory creation if missing dir   * @mode = Mode for directory creation if missing dir
  * return: -1 error, 0 directory path exist, >0 created missing dirs   * return: -1 error, 0 directory path exist, >0 created missing dirs
Line 706  int ioMkDir(const char *csDir, int mode); Line 775  int ioMkDir(const char *csDir, int mode);
   
 /*  /*
  * ioWatchDirLoop() Function for watching changes in directory and fire callback   * ioWatchDirLoop() Function for watching changes in directory and fire callback
    *
  * @csDir = Full directory path   * @csDir = Full directory path
  * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create   * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create
  * return: -1 error, !=-1 ok, number of total signaled events   * return: -1 error, !=-1 ok, number of total signaled events
Line 715  int ioWatchDirLoop(const char *csDir, int (*callback)( Line 785  int ioWatchDirLoop(const char *csDir, int (*callback)(
   
 /*  /*
  * io_rread() Raw VFS read function   * io_rread() Raw VFS read function
    *
  * @fd = File handle   * @fd = File handle
  * @buf = Read buffer   * @buf = Read buffer
  * @nbytes = Read buffer size   * @nbytes = Read buffer size
Line 725  int ioWatchDirLoop(const char *csDir, int (*callback)( Line 796  int ioWatchDirLoop(const char *csDir, int (*callback)(
 inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);  inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
 /*  /*
  * io_rwrite() Raw VFS write function   * io_rwrite() Raw VFS write function
    *
  * @fd = File handle   * @fd = File handle
  * @buf = Write buffer   * @buf = Write buffer
  * @nbytes = Write bytes from buffer   * @nbytes = Write bytes from buffer
Line 795  extern int io_Debug; Line 867  extern int io_Debug;
   
 /*  /*
  * ioCipher() Cipher wrapper for all supported crypto algorythms   * ioCipher() Cipher wrapper for all supported crypto algorythms
    *
  * @pInput = input buffer   * @pInput = input buffer
  * @inLen = input buffer len   * @inLen = input buffer len
  * @ppOutput = output allocated buffe, must be free after use   * @ppOutput = output allocated buffe, must be free after use
Line 809  int ioCipher(unsigned char *pInput, int inLen, unsigne Line 882  int ioCipher(unsigned char *pInput, int inLen, unsigne
   
 /*  /*
  * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings   * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings
    *
  * @pInput = input buffer   * @pInput = input buffer
  * @inLen = input buffer len   * @inLen = input buffer len
  * @ppOutput = output allocated buffe, must be free after use   * @ppOutput = output allocated buffe, must be free after use
Line 821  int io_Blowfish(unsigned char *pInput, int inLen, unsi Line 895  int io_Blowfish(unsigned char *pInput, int inLen, unsi
                 unsigned char *pKey, unsigned char *pIV, int nMode);                  unsigned char *pKey, unsigned char *pIV, int nMode);
 /*  /*
  * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES   * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES
    *
  * @pInput = Input buffer with ASCII   * @pInput = Input buffer with ASCII
  * @inLen = Input buffer data length   * @inLen = Input buffer data length
  * @ppOutput = Output buffer with cipher data, must be free after use   * @ppOutput = Output buffer with cipher data, must be free after use
Line 834  int io_ctr_AES(unsigned char *pInput, int inLen, unsig Line 909  int io_ctr_AES(unsigned char *pInput, int inLen, unsig
   
 /*  /*
  * ioAllocPTY() Allocate new PTY and TTY   * ioAllocPTY() Allocate new PTY and TTY
    *
  * @ptyfd = master fd, pty   * @ptyfd = master fd, pty
  * @ttyfd = slave fd, tty   * @ttyfd = slave fd, tty
  * @name = tty device name if not null   * @name = tty device name if not null
Line 846  inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _ Line 922  inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _
                 struct termios * __restrict term, struct winsize * __restrict winz);                  struct termios * __restrict term, struct winsize * __restrict winz);
 /*  /*
  * ioFreePTY() Release PTY and TTY device   * ioFreePTY() Release PTY and TTY device
    *
  * @ptyfd = master fd, pty (==-1 skip closing pty)   * @ptyfd = master fd, pty (==-1 skip closing pty)
  * @ttyname = tty filename   * @ttyname = tty filename
  * return: none   * return: none
Line 853  inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _ Line 930  inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _
 inline void ioFreePTY(int ptyfd, const char *ttyname);  inline void ioFreePTY(int ptyfd, const char *ttyname);
 /*  /*
  * ioChgWinPTY() Change window size of PTY   * ioChgWinPTY() Change window size of PTY
    *
  * @ptyfd = master fd, pty   * @ptyfd = master fd, pty
  * @row = row   * @row = row
  * @col = col   * @col = col
Line 864  inline int ioChgWinPTY(int ptyfd, unsigned short row,  Line 942  inline int ioChgWinPTY(int ptyfd, unsigned short row, 
                 unsigned short xpxl, unsigned short ypxl);                  unsigned short xpxl, unsigned short ypxl);
 /*  /*
  * ioSetOwnerTTY() Set owner to TTY   * ioSetOwnerTTY() Set owner to TTY
    *
  * @ttyname = tty filename   * @ttyname = tty filename
  * @UID = uid   * @UID = uid
  * @GID = gid   * @GID = gid
Line 872  inline int ioChgWinPTY(int ptyfd, unsigned short row,  Line 951  inline int ioChgWinPTY(int ptyfd, unsigned short row, 
 int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID);  int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID);
 /*  /*
  * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes.   * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes.
    *
  * @ttyfd = slave fd, tty   * @ttyfd = slave fd, tty
  * @ttyname = tty filename   * @ttyname = tty filename
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
Line 879  int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_ Line 959  int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_
 int ioSetSidTTY(int *ttyfd, const char *ttyname);  int ioSetSidTTY(int *ttyfd, const char *ttyname);
 /*  /*
  * ioSetRAWMode() Enter into RAW mode   * ioSetRAWMode() Enter into RAW mode
    *
  * @fd = tty fd   * @fd = tty fd
  * @otio = saved old termios for later restore if !=NULL   * @otio = saved old termios for later restore if !=NULL
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
Line 886  int ioSetSidTTY(int *ttyfd, const char *ttyname); Line 967  int ioSetSidTTY(int *ttyfd, const char *ttyname);
 inline int ioSetRAWMode(int fd, struct termios *otio);  inline int ioSetRAWMode(int fd, struct termios *otio);
 /*  /*
  * ioRestoreMode() Restore termios to tty fd   * ioRestoreMode() Restore termios to tty fd
    *
  * @fd = tty fd   * @fd = tty fd
  * @tio = termios structure for restore   * @tio = termios structure for restore
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
Line 893  inline int ioSetRAWMode(int fd, struct termios *otio); Line 975  inline int ioSetRAWMode(int fd, struct termios *otio);
 inline int ioRestoreMode(int fd, struct termios tio);  inline int ioRestoreMode(int fd, struct termios tio);
 /*  /*
  * ioForkPTY() Fork new process with session leader and new TTY   * ioForkPTY() Fork new process with session leader and new TTY
    *
  * @ptyfd = master fd, pty   * @ptyfd = master fd, pty
  * @name = tty device name if not null   * @name = tty device name if not null
  * @namesiz = name length, must be above 63 bytes.   * @namesiz = name length, must be above 63 bytes.
Line 906  pid_t ioForkPTY(int *ptyfd, char * __restrict name, in Line 989  pid_t ioForkPTY(int *ptyfd, char * __restrict name, in
   
 /*  /*
  * ioCreatePIDFile() Create PID file   * ioCreatePIDFile() Create PID file
    *
  * @csName = PID filename   * @csName = PID filename
  * @ifExists = !=0 if filename exists return error   * @ifExists = !=0 if filename exists return error
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
Line 914  inline int ioCreatePIDFile(const char *csName, int ifE Line 998  inline int ioCreatePIDFile(const char *csName, int ifE
   
 /*  /*
  * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS   * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS
    *
  * @s = socket   * @s = socket
  * @csFile = file for send   * @csFile = file for send
  * @sendLen = bytes to send, if 0 send all data   * @sendLen = bytes to send, if 0 send all data
Line 924  inline int ioCreatePIDFile(const char *csName, int ifE Line 1009  inline int ioCreatePIDFile(const char *csName, int ifE
 size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf);  size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf);
 /*  /*
  * ioRecvFile() Receive file from socket, fastest (zero-copy) way   * ioRecvFile() Receive file from socket, fastest (zero-copy) way
    *
  * @s = socket   * @s = socket
  * @csFile = file for receive   * @csFile = file for receive
  * @recvLen = receive bytes   * @recvLen = receive bytes
Removed from v.1.15  
changed lines
  Added in v.1.16

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