X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fccan_tokenizer%2Ftest%2Frun.c;h=7ff03da6da83900f000ddaee3536b10d05f4ddda;hp=9a4ae19ba9ce587ced48631c14011dbef6628f1b;hb=d1cea3ebf96f61b5bbac1e74975700770e06add6;hpb=69cc1b45b4921c0be738902fe0d5225f135e2aae

diff --git a/ccan/ccan_tokenizer/test/run.c b/ccan/ccan_tokenizer/test/run.c
index 9a4ae19b..7ff03da6 100644
--- a/ccan/ccan_tokenizer/test/run.c
+++ b/ccan/ccan_tokenizer/test/run.c
@@ -25,16 +25,16 @@
         THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "ccan_tokenizer/read_cnumber.c"
-#include "ccan_tokenizer/read_cstring.c"
-#include "ccan_tokenizer/dict.c"
-#include "ccan_tokenizer/ccan_tokenizer.c"
-#include "ccan_tokenizer/queue.c"
-#include "ccan_tokenizer/charflag.c"
+#include <ccan/ccan_tokenizer/read_cnumber.c>
+#include <ccan/ccan_tokenizer/read_cstring.c>
+#include <ccan/ccan_tokenizer/dict.c>
+#include <ccan/ccan_tokenizer/ccan_tokenizer.c>
+#include <ccan/ccan_tokenizer/queue.c>
+#include <ccan/ccan_tokenizer/charflag.c>
 
-#include "ccan_tokenizer/ccan_tokenizer.h"
+#include <ccan/ccan_tokenizer/ccan_tokenizer.h>
 
-#include "tap/tap.h"
+#include <ccan/tap/tap.h>
 
 #include <math.h>
 
@@ -147,7 +147,7 @@ static void test_read_cstring(void) {
 				queue_skip(mq);
 		}
 		if (i<e)
-			printf("Item %u is incorrect\n", i);
+			printf("Item %zu is incorrect\n", i);
 		ok(i==e, "Is message queue correct?");
 		ok(!queue_count(mq), "Message queue should be empty now.");
 	}
@@ -685,7 +685,7 @@ static void test_scan_number_single(const char *str_pipes,
 		return;
 	}
 	if (sn.dots_found != dots_found) {
-		fail("%s : sn.dots_found is %d; should be %d", str_pipes,
+		fail("%s : sn.dots_found is %zu; should be %zu", str_pipes,
 			sn.dots_found, dots_found);
 		return;
 	}
@@ -1411,7 +1411,7 @@ static void test_tokenizer(void) {
 	msg_fail:;
 	}
 	
-	test_tokenizer_file("ccan/ccan_tokenizer/test/run.c", &mq);
+	test_tokenizer_file("test/run.c", &mq);
 	
 	while (queue_count(mq)) {
 		struct tok_message msg = dequeue(mq);