--- libaitrpc/inc/aitrpc.h	2010/07/08 09:18:51	1.1.1.1.2.20
+++ libaitrpc/inc/aitrpc.h	2011/03/15 15:46:58	1.1.1.1.2.22
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1.2.20 2010/07/08 09:18:51 misho Exp $
+* $Id: aitrpc.h,v 1.1.1.1.2.22 2011/03/15 15:46:58 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITRPC_H
@@ -153,15 +153,16 @@ typedef struct {
 					} while (0)
 
 
-#define RPC_CALLBACK_CHK_RETARGS(f, n)	do { \
-						if (f->func_args != n) { \
-							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
+#define RPC_CALLBACK_CHECK_INPUT(x)	do { \
+						if (!x) { \
+							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
 							return -1; \
 						} \
 					} while (0)
-#define RPC_CALLBACK_CHECK_INPUT(f)	do { \
-						if (!f) { \
-							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
+#define RPC_CALLBACK_CHK_ARGS(f, n)	do { \
+						RPC_CALLBACK_CHECK_INPUT(f); \
+						if (f && f->func_args != n) { \
+							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
 							return -1; \
 						} \
 					} while (0)
@@ -337,14 +338,6 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv);
 
 /*
- * rpc_srv_getBLOB() Get registered BLOB 
- * @srv = RPC Server instance
- * @var = hash for variable
- * return: NULL not found, !=NULL return blob var
- */
-inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var);
-
-/*
  * rpc_srv_registerCall() Register call to RPC server
  * @srv = RPC Server instance
  * @csModule = Module name, if NULL self binary
@@ -476,6 +469,13 @@ rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restric
  * return: -1 error, 0 not found call, 1 unregister ok
  */
 int rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var);
+/*
+ * rpc_srv_getBLOB() Get registered BLOB 
+ * @srv = RPC Server instance
+ * @var = hash for variable
+ * return: NULL not found, !=NULL return blob var
+ */
+inline rpc_blob_t *rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var);
 
 /*
  * rpc_srv_sendBLOB() Send mapped BLOB to client