--- libelwix/inc/elwix.h 2013/01/17 10:05:35 1.1.1.1 +++ libelwix/inc/elwix.h 2013/06/03 22:50:00 1.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: elwix.h,v 1.1.1.1 2013/01/17 10:05:35 misho Exp $ +* $Id: elwix.h,v 1.4 2013/06/03 22:50:00 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -64,8 +64,9 @@ SUCH DAMAGE. #include #include #include -#include +#include #include +#include #ifndef STRSIZ @@ -102,18 +103,18 @@ SUCH DAMAGE. // elwix_SetProg() Set program memory pool name -inline void elwix_SetProg(const char *csProgName); +void elwix_SetProg(const char *csProgName); // elwix_GetProg() Get program memory pool name -inline const char *elwix_GetProg(); +const char *elwix_GetProg(); // elwix_GetErrno() Get error code of last operation -inline int elwix_GetErrno(); +int elwix_GetErrno(); // elwix_GetError() Get error text of last operation -inline const char *elwix_GetError(); +const char *elwix_GetError(); // elwix_mm_inuse() Check for memory management model -inline int elwix_mm_inuse(); +int elwix_mm_inuse(); /* @@ -123,13 +124,13 @@ inline int elwix_mm_inuse(); * @maxmem = memory limit * return: -1 error or !=-1 used memory management model */ -inline int elwixInit(int mm, unsigned long maxmem); +int elwixInit(int mm, unsigned long maxmem); /* * elwixFini() - Finish libelwix library memory management * * return: none */ -inline void elwixFini(); +void elwixFini(); /* memory management hooks */ extern void *(*e_malloc)(size_t); @@ -147,7 +148,15 @@ extern int elwix_Verbose; #define e_incVerbose (elwix_Verbose++) #define e_decVerbose (elwix_Verbose--) -#define EVERBOSE(x) if ((x) <= elwix_Verbose) +#define EVERBS(x) if ((x) <= elwix_Verbose) +#define EVERBOSE(x, fmt, ...) do { assert((fmt)); \ + if ((x) <= elwix_Verbose) { \ + char str[BUFSIZ] = { 0 }; \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + syslog(LOG_DEBUG, "Verbose(%d):%s(%d): %s\n", \ + (x), __func__, __LINE__, str); \ + } \ + } while (0) /* Debug macros */ extern int elwix_Debug; @@ -157,7 +166,7 @@ extern int elwix_Debug; #define ELWIX_DEBUG_ANY 0xFFFFFFFF #define ETRACE(x) if (elwix_Debug & ELWIX_DEBUG_TRACE) \ - syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__) + syslog(LOG_DEBUG, "I'm in %s(%d)\n", __func__, __LINE__) #define EDEBUG(x, fmt, ...) do { assert((fmt)); \ if ((x) & elwix_Debug) { \ char str[BUFSIZ] = { 0 }; \