--- libaitio/inc/aitio.h 2012/05/23 11:59:51 1.18.2.3 +++ libaitio/inc/aitio.h 2012/05/19 00:11:58 1.19 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.18.2.3 2012/05/23 11:59:51 misho Exp $ +* $Id: aitio.h,v 1.19 2012/05/19 00:11:58 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,15 +60,6 @@ SUCH DAMAGE. #include -#ifdef USE_MPOOL -#else -#define xmalloc(x) malloc(x) -#define xcalloc(x, y) calloc(x, y) -#define xrealloc(x, y) realloc(x, y) -#define xstrdup(x) strdup(x) -#define xfree(x) free(x) -#endif - #define VACUUM_LEFT 1 #define VACUUM_BETWEEN 2 @@ -151,7 +142,7 @@ typedef struct { #define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) #define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \ - __val = xrealloc(__val, sizeof(ait_val_t) + _len); \ + __val = realloc(__val, sizeof(ait_val_t) + _len); \ if (__val) { \ __val->val_type = data; AIT_LEN(__val) = _len; \ if ((_p)) \ @@ -163,18 +154,18 @@ typedef struct { __val->val_type = ptr; AIT_LEN(__val) = _len; \ __val->val.ptr = _p; } while (0) #define AIT_RE_BUF(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \ - void *__ptr = xrealloc(AIT_GET_BUF(__val), _len); \ + void *__ptr = realloc(AIT_GET_BUF(__val), _len); \ if (__ptr) { \ __val->val.buffer = __ptr; AIT_LEN(__val) = _len; \ } } while (0) #define AIT_SET_BUF2(_vl, _c, _len) do { ait_val_t *__val = (_vl); assert(__val); \ - __val->val.buffer = xmalloc(_len); \ + __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ memset(__val->val.buffer, _c, _len); \ } } while (0) #define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ - __val->val.buffer = xmalloc(_len); \ + __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ if ((_v)) \ @@ -183,14 +174,14 @@ typedef struct { memset(__val->val.buffer, 0, _len); \ } } while (0) #define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ - __val->val.string = (int8_t*) xstrdup((_v)); \ + __val->val.string = (int8_t*) strdup((_v)); \ if (__val->val.string) { \ __val->val_type = string; \ AIT_LEN(__val) = strlen((_v)) + 1; \ } } while (0) #define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ assert(AIT_TYPE(__val) == string); \ - void *__p = xrealloc(__val->val.string, \ + void *__p = realloc(__val->val.string, \ AIT_LEN(__val) + strlen((_v))); \ if (__p) { \ __val->val.string = __p; \ @@ -255,18 +246,18 @@ typedef struct { } while (0) #define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t))) - /* if attribute zeroCopy is set not execute xfree() */ + /* if attribute zeroCopy is set not execute free() */ #define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ switch (AIT_TYPE(__val)) { \ case buffer: \ if (__val->val.buffer) { \ - xfree(__val->val.buffer); \ + free(__val->val.buffer); \ __val->val.buffer = NULL; \ } \ break; \ case string: \ if (__val->val.string) { \ - xfree(__val->val.string); \ + free(__val->val.string); \ __val->val.string = NULL; \ } \ break; \ @@ -300,10 +291,7 @@ inline int io_GetErrno(); // io_GetError() Get error text of last operation inline const char *io_GetError(); -// mpool_inuse() Check for mpool usage -inline int mpool_inuse(); - /* * io_ether_ntoa() - Convert ethernet address to string * @@ -498,7 +486,7 @@ int ioRegexGet(const char *csRegex, const char *csData * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace - * return: NULL not match or error; !=NULL allocated new string, must be xfree after use! + * return: NULL not match or error; !=NULL allocated new string, must be free after use! */ char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew); @@ -506,7 +494,7 @@ char *ioRegexReplace(const char *csRegex, const char * * ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" * * @csString = Input string - * return: NULL error, !=NULL Allocated new string evaluated from input string, must be xfree() + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() */ char *ioStrAst(const char *csString); @@ -543,7 +531,7 @@ inline int io_TrimStr(char * __restrict psLine); * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be xfree) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) */ inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen); /* @@ -551,7 +539,7 @@ inline unsigned char *io_Ch2Hex(unsigned char *psLine, * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be xfree) + * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) */ inline char *io_Hex2Ch(unsigned char *psLine, int lineLen); @@ -713,7 +701,7 @@ inline int io_argsNum(const char *csArgs, const char * * @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 xfree with io_arrayDestroy() after use!) + * @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, @@ -823,7 +811,7 @@ sarr_t *io_array2sarr(array_t ** __restrict a, int seg * io_CopyEnv() - Copy environment to new environment array; * * @oldenv = Environment array - * return: NULL error; !=NULL Allocated new environment array(must be xfree) + * return: NULL error; !=NULL Allocated new environment array(must be free) */ char **io_CopyEnv(const char **oldenv); /* @@ -831,7 +819,7 @@ char **io_CopyEnv(const char **oldenv); * * @psProg = Program name for execute * @oldarg = Arguments array - * return: NULL error; !=NULL Allocated execution array(must be xfree) + * return: NULL error; !=NULL Allocated execution array(must be free) */ char **io_ExecArgs(const char *psProg, const char **oldarg); /* @@ -948,7 +936,7 @@ extern int io_Debug; * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be xfree after use + * @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) @@ -963,7 +951,7 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be xfree after use + * @ppOutput = output allocated buffe, must be free after use * @pKey = key * @pIV = IV, salt (8 bytes) * @nMode = Mode 0 - decrypting or 1 - encrypting @@ -976,7 +964,7 @@ int io_Blowfish(unsigned char *pInput, int inLen, unsi * * @pInput = Input buffer with ASCII * @inLen = Input buffer data length - * @ppOutput = Output buffer with cipher data, must be xfree after use + * @ppOutput = Output buffer with cipher data, must be free after use * @pKey = Key * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!! * return: -1 error or >-1 how many cipher blocks proceeded