--- libaitsess/contrib/test2.c	2012/02/10 17:14:21	1.1.2.6
+++ libaitsess/contrib/test2.c	2012/02/10 23:31:36	1.1.2.8
@@ -45,45 +45,50 @@ int main(int argc, char **argv)
 	*/
 
 	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
-	if (ALLOC_MEMORY("/tmp/abra-kadabra-321", 1003, 4096, n) == -1) {
+	if (ALLOC_MEMORY(1003, 4096, n) == -1) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 2;
 	}
 	if (sess_commitSession(n, inp) == -1) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 2;
 	}
-	sess_freeSession(NULL, &n);
+	sess_freeSession(&n);
+	for (i = 0; i < io_arraySize(inp); i++)
+		AIT_FREE_VAL(io_arrayGet(inp, i));
 	io_arrayFree(inp);
 	io_arrayDestroy(&inp);
 	printf("set session");
 	getchar();
 	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
-	ALLOC_MEMORY("/tmp/abra-kadabra-321", 1003, 4096, n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 3;
 	}
 	if (!(inp = sess_prepareSession(n, 42))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 3;
 	}
 	for (i = 0; i < io_arraySize(inp); i++)
 		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
 	sess_doneSession(n, &inp);
-	sess_freeSession(NULL, &n);
+	sess_freeSession(&n);
 	getchar();
 	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
-	ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 4;
 	}
 	if (!(inp = sess_prepareSession(n, 0))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 4;
 	}
 	AIT_FREE_VAL(io_array(inp, 2, ait_val_t*));
@@ -91,22 +96,30 @@ int main(int argc, char **argv)
 	for (i = 0; i < io_arraySize(inp); i++)
 		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
 	sess_commitSession(n, inp);
+	for (i = 0; i < io_arraySize(inp); i++)
+		AIT_FREE_VAL(io_arrayGet(inp, i));
 	sess_doneSession(n, &inp);
-	sess_freeSession(NULL, &n);
+	sess_freeSession(&n);
 	getchar();
-	ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, &n);
+	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 3;
 	}
 	if (!(inp = sess_prepareSession(n, 42))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 3;
 	}
 	for (i = 0; i < io_arraySize(inp); i++)
 		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
+	for (i = 0; i < io_arraySize(inp); i++)
+		AIT_FREE_VAL(io_arrayGet(inp, i));
 	sess_doneSession(n, &inp);
-	DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+	FREE_MEMORY(n);
+	sess_freeSession(&n);
+
 	return 0;
 }