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.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
|
Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein <rocky@gnu.org>
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -34,6 +34,10 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_ERRNO_H
|
#ifdef HAVE_ERRNO_H
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ cdio_read_mode2_sector
|
|||||||
cdio_read_mode2_sectors
|
cdio_read_mode2_sectors
|
||||||
cdio_read_sector
|
cdio_read_sector
|
||||||
cdio_read_sectors
|
cdio_read_sectors
|
||||||
|
cdio_realpath
|
||||||
cdio_set_arg
|
cdio_set_arg
|
||||||
cdio_set_blocksize
|
cdio_set_blocksize
|
||||||
cdio_set_drive_speed
|
cdio_set_drive_speed
|
||||||
|
|||||||
@@ -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");
|
scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple");
|
||||||
if (scsi_tuple != scsi_tuple_linux) {
|
if (scsi_tuple == NULL) {
|
||||||
fprintf(stderr,
|
fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n");
|
||||||
"cdio_get_arg(\"scsi-tuple\") differs from cdio_get_arg(\"scsi-tuple-linux\").\n");
|
exit(3);
|
||||||
exit(4);
|
|
||||||
}
|
}
|
||||||
if (cdio_loglevel_default == CDIO_LOG_DEBUG)
|
if (cdio_loglevel_default == CDIO_LOG_DEBUG)
|
||||||
printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
|
printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user