From 257739f2d43f5a0bc1977b980d33e10ef89b1ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 22 May 2014 16:09:34 +0200 Subject: [PATCH] FAT: improved last fix. * Don't use filename at all, since it's not clear if puni has already been set at this point. * Also, fixed warning *vnid is ino_t, not a pointer. --- src/add-ons/kernel/file_systems/fat/dir.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/file_systems/fat/dir.c b/src/add-ons/kernel/file_systems/fat/dir.c index 62afde2f46..fb4870e279 100644 --- a/src/add-ons/kernel/file_systems/fat/dir.c +++ b/src/add-ons/kernel/file_systems/fat/dir.c @@ -81,18 +81,15 @@ _next_dirent_(struct diri *iter, struct _dirent_info_ *oinfo, char *filename, DPRINTF(2, ("_next_dirent_: %lx/%lx/%lx\n", iter->csi.cluster, iter->csi.sector, iter->current_index)); if (buffer[0] == 0) { // quit if at end of table - if (start_index != 0xffff) { - *puni = 0; - dprintf("lfn entry (%s) with no alias\n", uni); - } + if (start_index != 0xffff) + dprintf("lfn entry (%" B_PRIu32 ") with no alias\n", lfn_count); return ENOENT; } if (buffer[0] == 0xe5) { // skip erased entries if (start_index != 0xffff) { - *puni = 0; - dprintf("lfn entry (%s) with intervening erased entries\n", - uni); + dprintf("lfn entry (%" B_PRIu32 ") with intervening erased " + "entries\n", lfn_count); start_index = 0xffff; } DPRINTF(2, ("entry erased, skipping...\n")); @@ -265,7 +262,7 @@ get_next_dirent(nspace *vol, vnode *dir, struct diri *iter, ino_t *vnid, } DPRINTF(2, ("get_next_dirent: found %s (vnid %Lx)\n", filename, - vnid != NULL ? *vnid : NULL)); + vnid != NULL ? *vnid : (ino_t)0)); return B_NO_ERROR; }