--- libaitio/inc/aitio.h	2011/08/25 14:31:32	1.10.2.2
+++ libaitio/inc/aitio.h	2011/08/26 12:24:44	1.10.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.10.2.2 2011/08/25 14:31:32 misho Exp $
+* $Id: aitio.h,v 1.10.2.3 2011/08/26 12:24:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -272,19 +272,19 @@ int io_arrayGrow(array_t * __restrict arr, int newNumI
  */
 int io_arrayVacuum(array_t * __restrict arr, int fromWhere);
 
-#define io_arraySize(_arr)		((assert(_arr)), _arr->arr_num)
+#define io_arraySize(_arr)		(assert((_arr)), (_arr)->arr_num)
 
-#define io_arrayGet(_arr, _d, _type)	((assert(_arr && _arr->arr_num > _d)), \
-						((_type) *(_arr->arr_data + _d)))
+#define io_arrayGet(_arr, _d, _type)	(assert((_arr) && (_arr)->arr_num > _d), \
+						((_type) *((_arr)->arr_data + _d)))
 #define io_arraySet(_arr, _d, _ptr)	do { \
-						assert(_arr && _arr->arr_num > _d); \
-						*(_arr->arr_data + _d) = (void*) _ptr; \
+						assert((_arr) && (_arr)->arr_num > _d); \
+						*((_arr)->arr_data + _d) = (void*) _ptr; \
 					} while (0)
 #define io_arrayDel(_arr, _d, _fri)	do { \
-						assert(_arr && _arr->arr_num > _d); \
+						assert((_arr) && (_arr)->arr_num > _d); \
 						if (_fri) \
-							free(*(_arr->arr_data + _d)); \
-						*(_arr->arr_data + _d) = NULL; \
+							free(*((_arr)->arr_data + _d)); \
+						*((_arr)->arr_data + _d) = NULL; \
 					} while (0)
 
 /*
@@ -362,7 +362,7 @@ int io_sarrGrow(sarr_t * __restrict arr, int newNumIte
  * return: -1 error, >-1 freed segments
  */
 inline int io_sarrVacuum(sarr_t * __restrict arr);
-#define io_sarrSize(_arr)		((assert(_arr)), _arr->sarr_num)
+#define io_sarrSize(_arr)		(assert((_arr)), (_arr)->sarr_num)
 /*
  * io_sarrGet() - Get element from dynamic split-order array
  * @arr = Array
@@ -386,8 +386,8 @@ void *io_sarrGet2(sarr_t * __restrict arr, unsigned in
  * return: NULL error or empty, !=NULL old value in element
  */
 inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data);
-#define io_sarrDel(_arr, _idx)		io_sarrSet(_arr, _idx, NULL)
-#define io_sarr(_arr, _idx, _type)	(_type)io_sarrGet(_arr, _idx)
+#define io_sarrDel(_arr, _idx)		io_sarrSet((_arr), _idx, NULL)
+#define io_sarr(_arr, _idx, _type)	(_type)io_sarrGet((_arr), _idx)
 /*
  * io_sarr2array() - Convert from split-order array to dynamic array
  * @sa = split array
@@ -510,7 +510,7 @@ extern int io_Debug;
 #define ioDEBUG(x, fmt, ...)	do { \
 					assert((fmt)); \
 					char str[STRSIZ] = { 0 }; \
-					snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
+					snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \
 					if ((x) <= io_Debug) \
 						syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \
 								(x), __func__, __LINE__, str); \
@@ -519,7 +519,7 @@ extern int io_Debug;
 #define ioERROR(x, fmt, ...)	do { \
 					assert((fmt)); \
 					char str[STRSIZ] = { 0 }; \
-					snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
+					snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \
 					syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \
 							 __func__, __LINE__, (x), str); \
 				} while (0)