X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Ftest-bitfield.c;h=5911eb461b404bce951184319b9b5347b2598b72;hb=ceb811dc38fe93065f7c1119b9509f9f29a45d76;hp=2fc2e3a09e712fc13978bc5ca94ab9a3fc9ebe5a;hpb=6dc2ca620b58bbd67df61d8a5265ee4292f2dd37;p=babeltrace.git

diff --git a/tests/test-bitfield.c b/tests/test-bitfield.c
index 2fc2e3a0..5911eb46 100644
--- a/tests/test-bitfield.c
+++ b/tests/test-bitfield.c
@@ -3,7 +3,7 @@
  *
  * Common Trace Format - bitfield test program
  *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -140,7 +140,7 @@ int run_test_unsigned(void)
 		for (l = nrbits; l < (CHAR_BIT * TEST_LEN) - s; l++) {
 			init_byte_array(target.c, TEST_LEN, 0xFF);
 			ctf_bitfield_write(target.c, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 0);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (bytewise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -150,7 +150,7 @@ int run_test_unsigned(void)
 
 			init_byte_array(target.c, TEST_LEN, 0xFF);
 			ctf_bitfield_write(target.s, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 0);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (shortwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -160,7 +160,7 @@ int run_test_unsigned(void)
 
 			init_byte_array(target.c, TEST_LEN, 0xFF);
 			ctf_bitfield_write(target.i, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 0);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (intwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -170,7 +170,7 @@ int run_test_unsigned(void)
 
 			init_byte_array(target.c, TEST_LEN, 0xFF);
 			ctf_bitfield_write(target.l, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 0);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (longwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -180,7 +180,7 @@ int run_test_unsigned(void)
 
 			init_byte_array(target.c, TEST_LEN, 0xFF);
 			ctf_bitfield_write(target.ll, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 0);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (longlongwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -222,7 +222,7 @@ int run_test_signed(void)
 		for (l = nrbits; l < (8 * TEST_LEN) - s; l++) {
 			init_byte_array(target.c, TEST_LEN, 0x0);
 			ctf_bitfield_write(target.c, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 1);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (bytewise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -232,7 +232,7 @@ int run_test_signed(void)
 
 			init_byte_array(target.c, TEST_LEN, 0x0);
 			ctf_bitfield_write(target.s, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 1);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (shortwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -242,7 +242,7 @@ int run_test_signed(void)
 
 			init_byte_array(target.c, TEST_LEN, 0x0);
 			ctf_bitfield_write(target.i, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 1);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (intwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -252,7 +252,7 @@ int run_test_signed(void)
 
 			init_byte_array(target.c, TEST_LEN, 0x0);
 			ctf_bitfield_write(target.l, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 1);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (longwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -262,7 +262,7 @@ int run_test_signed(void)
 
 			init_byte_array(target.c, TEST_LEN, 0x0);
 			ctf_bitfield_write(target.ll, s, l, src);
-			readval = _ctf_bitfield_read_64(target.c, s, l, BYTE_ORDER, 1);
+			ctf_bitfield_read(target.c, s, l, &readval);
 			if (readval != src) {
 				printf("Error (longlongwise) src %lX read %llX shift %d len %d\n",
 				       src, readval, s, l);
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
 	printf("lluwise\n");
 	print_byte_array(target.c, 8);
 
-	readval = _ctf_bitfield_read_64(target.c, shift, len, BYTE_ORDER, 0);
+	ctf_bitfield_read(target.c, shift, len, &readval);
 	printf("read: %llX\n", readval);
 
 	ret = run_test();