X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_fat_test.c;h=63be71c6b378b6b0424bf7cc3ff708ce278a5dc4;hb=d37945f1404043e6bd287ce7ad7a57bc3289609b;hp=a1bd5fbf0c4321cd775aa205933385bd8912d41c;hpb=fae116fbebb9658fe15690ff43dfe8568a58c2a9;p=fw%2Faltos

diff --git a/src/test/ao_fat_test.c b/src/test/ao_fat_test.c
index a1bd5fbf..63be71c6 100644
--- a/src/test/ao_fat_test.c
+++ b/src/test/ao_fat_test.c
@@ -3,7 +3,8 @@
  *
  * 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -158,14 +159,14 @@ ao_fat_entry_raw_read(cluster_t cluster, uint8_t fat)
 		cluster <<= 1;
 	sector = cluster >> SECTOR_SHIFT;
 	offset = cluster & SECTOR_MASK;
-	buf = ao_fat_sector_get(fat_start + fat * sectors_per_fat + sector);
+	buf = _ao_fat_sector_get(fat_start + fat * sectors_per_fat + sector);
 	if (!buf)
 		return 0;
 	if (fat32)
 		ret = get_u32(buf + offset);
 	else
 		ret = get_u16(buf + offset);
-	ao_fat_sector_put(buf, 0);
+	_ao_fat_sector_put(buf, 0);
 	return ret;
 }
 
@@ -252,7 +253,7 @@ check_file(dirent_t dent, cluster_t first_cluster, dirent_t *used)
 	     fat32 ? !AO_FAT_IS_LAST_CLUSTER(cluster) : !AO_FAT_IS_LAST_CLUSTER16(cluster);
 	     cluster = ao_fat_entry_raw_read(cluster, 0))
 	{
-		if (!ao_fat_cluster_valid(cluster))
+		if (!_ao_fat_cluster_valid(cluster))
 			fatal("file %d: invalid cluster %08x\n", dent, cluster);
 		if (used[cluster])
 			fatal("file %d: duplicate cluster %08x also in file %d\n", dent, cluster, used[cluster]-1);
@@ -274,7 +275,7 @@ check_fs(void)
 
 	used = calloc(sizeof (dirent_t), number_cluster);
 
-	for (r = 0; (dent = ao_fat_root_get(r)); r++) {
+	for (r = 0; (dent = _ao_fat_root_get(r)); r++) {
 		cluster_t	clusters;
 		offset_t	size;
 		cluster_t	first_cluster;
@@ -287,7 +288,7 @@ check_fs(void)
 		if (fat32)
 			first_cluster |= (cluster_t) get_u16(dent + 0x14) << 16;
 		size = get_u32(dent + 0x1c);
-		ao_fat_root_put(dent, r, 0);
+		_ao_fat_root_put(dent, r, 0);
 
 		if (name[0] == AO_FAT_DENT_END) {
 			break;
@@ -308,12 +309,12 @@ check_fs(void)
 	}
 	if (!fat32) {
 		for (; r < root_entries; r++) {
-			uint8_t	*dent = ao_fat_root_get(r);
+			uint8_t	*dent = _ao_fat_root_get(r);
 			if (!dent)
 				fatal("cannot map dent %d\n", r);
 			if (dent[0] != AO_FAT_DENT_END)
 				fatal("found non-zero dent past end %d\n", r);
-			ao_fat_root_put(dent, r, 0);
+			_ao_fat_root_put(dent, r, 0);
 		}
 	} else {
 		check_file((dirent_t) -1, root_cluster, used);
@@ -536,7 +537,7 @@ do_test(void (*test)(void))
 	ao_fat_init();
 
 	check_bufio("top");
-	ao_fat_setup();
+	_ao_fat_setup();
 
 	check_fs();
 	check_bufio("after setup");