From 67c86230519db22b3731e789e0e86381e8d29ff6 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sun, 17 Jan 2010 04:49:47 -0500 Subject: [PATCH] lib/driver/libcdio.sym: cdio_realpath is extern now. udffile.c: remove warning test/driver/gnu_linux.c: don't have scsi-tuple-linux any more. --- example/udffile.c | 6 +++++- lib/driver/libcdio.sym | 1 + test/driver/gnu_linux.c | 14 ++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/example/udffile.c b/example/udffile.c index e67fb002..42290446 100644 --- a/example/udffile.c +++ b/example/udffile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein + Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein 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 @@ -34,6 +34,10 @@ #include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #ifdef HAVE_ERRNO_H #include #endif diff --git a/lib/driver/libcdio.sym b/lib/driver/libcdio.sym index 51955e7e..69198a69 100644 --- a/lib/driver/libcdio.sym +++ b/lib/driver/libcdio.sym @@ -164,6 +164,7 @@ cdio_read_mode2_sector cdio_read_mode2_sectors cdio_read_sector cdio_read_sectors +cdio_realpath cdio_set_arg cdio_set_blocksize cdio_set_drive_speed diff --git a/test/driver/gnu_linux.c b/test/driver/gnu_linux.c index fee74306..bb414a39 100644 --- a/test/driver/gnu_linux.c +++ b/test/driver/gnu_linux.c @@ -65,18 +65,12 @@ main(int argc, const char *argv[]) } { - const char *psz_source = NULL, *scsi_tuple, *scsi_tuple_linux; + const char *psz_source = NULL, *scsi_tuple; - scsi_tuple_linux = cdio_get_arg(p_cdio, "scsi-tuple-linux"); - if (scsi_tuple_linux == NULL) { - fprintf(stderr, "cdio_get_arg(\"scsi-tuple-linux\") returns NULL.\n"); - exit(3); - } scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple"); - if (scsi_tuple != scsi_tuple_linux) { - fprintf(stderr, - "cdio_get_arg(\"scsi-tuple\") differs from cdio_get_arg(\"scsi-tuple-linux\").\n"); - exit(4); + if (scsi_tuple == NULL) { + fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n"); + exit(3); } if (cdio_loglevel_default == CDIO_LOG_DEBUG) printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",