From 0945b14311b948a3edb4259638bdda05f604e611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 29 Sep 2010 09:17:14 +0000 Subject: [PATCH] * Made the "cdda_text" test application compile again. * Improved error output. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38843 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../add-ons/kernel/file_systems/cdda/Jamfile | 1 + .../kernel/file_systems/cdda/cdda_text.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/cdda/Jamfile b/src/tests/add-ons/kernel/file_systems/cdda/Jamfile index 75ee89ac8d..bdbf993baa 100644 --- a/src/tests/add-ons/kernel/file_systems/cdda/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/cdda/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems cdda ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems cdda ] ; +UsePrivateHeaders drivers ; SimpleTest cdda_text : diff --git a/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp b/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp index 79f923cbe5..a8839b0917 100644 --- a/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp +++ b/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp @@ -1,17 +1,18 @@ /* - * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2007-2010, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. */ -#include "cdda.h" -#include "cddb.h" - #include #include #include +#include #include +#include "cdda.h" +#include "cddb.h" + extern const char* __progname; @@ -46,8 +47,11 @@ main(int argc, char** argv) uint8 buffer[1024]; scsi_toc_toc *toc = (scsi_toc_toc *)buffer; - if (read_table_of_contents(fd, toc, sizeof(buffer)) < 0) { - fprintf(stderr, "%s: Retrieving TOC failed", __progname); + + status_t status = read_table_of_contents(fd, toc, sizeof(buffer)); + if (status != B_OK) { + fprintf(stderr, "%s: Retrieving TOC failed: %s\n", __progname, + strerror(status)); return -1; }