--- libelwix/inc/elwix.h 2013/07/07 21:05:58 1.7.2.1 +++ libelwix/inc/elwix.h 2019/12/18 20:00:17 1.16.32.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: elwix.h,v 1.7.2.1 2013/07/07 21:05:58 misho Exp $ +* $Id: elwix.h,v 1.16.32.2 2019/12/18 20:00:17 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,16 +49,22 @@ SUCH DAMAGE. #include #include +#include #include #include -#include #include -#include #include +#ifndef __linux__ +#include +#include #include +#else +#include +#endif #include #include +#include #include #include #include @@ -71,6 +77,8 @@ SUCH DAMAGE. #include #include #include +#include +#include #ifndef STRSIZ @@ -81,6 +89,20 @@ SUCH DAMAGE. #define NBBY 8 /* number of bits in a byte */ #endif +#ifndef BYTE_ORDER + #ifndef LITTLE_ENDIAN + #define LITTLE_ENDIAN 1234 + #endif /* LITTLE_ENDIAN */ + #ifndef BIG_ENDIAN + #define BIG_ENDIAN 4321 + #endif /* BIG_ENDIAN */ + #ifdef WORDS_BIGENDIAN + #define BYTE_ORDER BIG_ENDIAN + #else /* WORDS_BIGENDIAN */ + #define BYTE_ORDER LITTLE_ENDIAN + #endif /* WORDS_BIGENDIAN */ +#endif /* BYTE_ORDER */ + #ifndef be16toh #define be16toh betoh16 #endif @@ -155,6 +177,9 @@ SUCH DAMAGE. #define VACUUM_BETWEEN 2 +extern int __isthreaded; + + // elwix_SetProg() Set program memory pool name void elwix_SetProg(const char *csProgName); // elwix_GetProg() Get program memory pool name @@ -185,6 +210,32 @@ int elwixInit(int mm, unsigned long maxmem); */ void elwixFini(); +/* + * elwix_byteOrder() - Detect platform byte order + * + * return: 1 = little endian or 0 big endian + */ +int elwix_byteOrder(); + +#ifndef strlcpy +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t strlcpy(char *dst, const char *src, size_t siz); +#endif +#ifndef strlcat +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t strlcat(char *dst, const char *src, size_t siz); +#endif + /* memory management hooks */ extern void *(*e_malloc)(size_t); extern void *(*e_calloc)(size_t, size_t); @@ -204,15 +255,26 @@ extern int 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); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ + syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \ + (x), __func__, __LINE__, __str); \ } \ } while (0) +#define EVERBOSE2(x, fmt, ...) do { assert((fmt)); \ + if ((x) <= elwix_Verbose) { \ + char __str[0x10000] = { [0 ... 0xffff] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ + syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \ + (x), __func__, __LINE__, __str); \ + } \ + } while (0) + /* Debug macros */ extern int elwix_Debug; +#define e_Debug elwix_Debug + #define ELWIX_DEBUG_OFF 0x0 #define ELWIX_DEBUG_TRACE 0x1 #define ELWIX_DEBUG_LOG 0x2 @@ -222,33 +284,42 @@ extern int elwix_Debug; 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 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog(LOG_DEBUG, "Debug(%d):%s(%d): %s\n", \ - (x), __func__, __LINE__, str); \ + (x), __func__, __LINE__, __str); \ } \ } while (0) /* Logger macro */ #define ELOGGER(x, fmt, ...) do { assert((fmt)); \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog((x), "Logger:%s(%d): %s\n", \ - __func__, __LINE__, str); \ + __func__, __LINE__, __str); \ } while (0) +#define EWARNING(x, fmt, ...) do { assert((fmt)); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ + syslog(LOG_WARNING, "Warning:%s(%d): #%d - %s\n", \ + __func__, __LINE__, (x), __str); \ + } while (0) /* Error state macros */ #define EERROR(x, fmt, ...) do { assert((fmt)); \ - char str[BUFSIZ] = { 0 }; \ - snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ syslog(LOG_ERR, "Error:%s(%d): #%d - %s\n", \ - __func__, __LINE__, (x), str); \ + __func__, __LINE__, (x), __str); \ } while (0) #define ESYSERR(x) do { \ - if (x > 0 || errno) \ + if (x > 0 || errno) { \ + int _ern = errno; \ syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \ __func__, __LINE__, x > 0 ? x : errno, \ strerror(x > 0 ? x : errno)); \ + errno = _ern; \ + } \ } while (0) #define ELIBERR(ait) do { \ if (ait##_GetErrno()) \