From 0e195cc633b3b6cbceee4e80667983321e353f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 5 Sep 2006 09:29:44 +0000 Subject: [PATCH] fix obvious errors git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18745 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/iso9660/iso9660.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp index a331347ca3..c7a29533b9 100644 --- a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp +++ b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp @@ -379,8 +379,7 @@ check_common_volume_descriptor(iso9660_common_volume_descriptor *common) status_t iso9660_fs_identify(int deviceFD, iso9660_info *info) { - bool result = false; - uchar *buffer = NULL; + char buffer[ISO_PVD_SIZE]; bool exit = false; status_t error = B_OK; nspace *vol; @@ -402,7 +401,7 @@ iso9660_fs_identify(int deviceFD, iso9660_info *info) iso9660_common_volume_descriptor *common = NULL; // Read the block containing the current descriptor - error = read_pos (vol->fdOfSession, offset, (void *)&buffer, ISO_PVD_SIZE); + error = read_pos (vol->fd, offset, (void *)&buffer, ISO_PVD_SIZE); offset += ISO_PVD_SIZE; if (error < ISO_PVD_SIZE) { break; @@ -516,10 +515,6 @@ iso9660_fs_identify(int deviceFD, iso9660_info *info) break; } } - if (buffer) { - free(buffer); - buffer = NULL; - } } free(vol);