--- libelwix/example/test_pack.c	2014/02/11 00:43:41	1.4
+++ libelwix/example/test_pack.c	2014/02/11 01:06:19	1.5
@@ -48,19 +48,19 @@ main(int argc, char **argv)
 	printf("test rpack_raw::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++) {
 		if (i == 4) {
-			str = rpack_raw(rp, "F0ST4T4", 8);
+			str = rpack_rdata(rp, "F0ST4T4", 8);
 			str[7] = 0;
 			printf("\t%d) %s\n", i, str ? str : NULL);
 			i += 8;
 		} else {
-			str = rpack_raw(rp, NULL, 1);
+			str = rpack_rdata(rp, NULL, 1);
 			printf("\t%d) %c\n", i, str ? *str : 0xff);
 		}
 		e_free(str);
 	}
 	RPACK_REWIND(rp);
 	for (i = 0; i < RPACK_LEN(rp); i++) {
-		str = rpack_raw(rp, NULL, 1);
+		str = rpack_rdata(rp, NULL, 1);
 		printf("\t%d) %c\n", i, str ? *str : 0xff);
 		e_free(str);
 	}
@@ -89,6 +89,17 @@ main(int argc, char **argv)
 		printf("\t%d) %x\n", i, rpack_uint16(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
+	printf("test rpack_ruint16::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		if (i == 4)
+			printf("\t%d) %x\n", i, rpack_ruint16(rp, (uint16_t*) &n16, 0));
+		else
+			printf("\t%d) %x\n", i, rpack_ruint16(rp, NULL, 0));
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		printf("\t%d) %x\n", i, rpack_ruint16(rp, NULL, 0));
+	RPACK_REWIND(rp);
+
 	printf("test rpack_uint24::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
@@ -100,6 +111,17 @@ main(int argc, char **argv)
 		printf("\t%d) %x\n", i, rpack_uint24(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
+	printf("test rpack_ruint24::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		if (i == 4)
+			printf("\t%d) %x\n", i, rpack_ruint24(rp, (uint32_t*) &n32, 0));
+		else
+			printf("\t%d) %x\n", i, rpack_ruint24(rp, NULL, 0));
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		printf("\t%d) %x\n", i, rpack_ruint24(rp, NULL, 0));
+	RPACK_REWIND(rp);
+
 	printf("test rpack_uint32::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
@@ -111,6 +133,17 @@ main(int argc, char **argv)
 		printf("\t%d) %x\n", i, rpack_uint32(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
+	printf("test rpack_ruint32::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		if (i == 4)
+			printf("\t%d) %x\n", i, rpack_ruint32(rp, (uint32_t*) &n32, 0));
+		else
+			printf("\t%d) %x\n", i, rpack_ruint32(rp, NULL, 0));
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		printf("\t%d) %x\n", i, rpack_ruint32(rp, NULL, 0));
+	RPACK_REWIND(rp);
+
 	printf("test rpack_uint64::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
@@ -120,6 +153,17 @@ main(int argc, char **argv)
 	RPACK_REWIND(rp);
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		printf("\t%d) %llx\n", i, rpack_uint64(rp, NULL, 0));
+	RPACK_REWIND(rp);
+
+	printf("test rpack_ruint64::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		if (i == 4)
+			printf("\t%d) %llx\n", i, rpack_ruint64(rp, (uint64_t*) &n64, 0));
+		else
+			printf("\t%d) %llx\n", i, rpack_ruint64(rp, NULL, 0));
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		printf("\t%d) %llx\n", i, rpack_ruint64(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
 	rpack_destroy(&rp);