claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

mmc_hl_cmds.c: remove gcc warning

Browse Source 
solaris.c: remove unused fn warning when not on solaris
check_cue.sh.in: fix so we can build outside of source tree. With this, "make distcheck" works again.
This commit is contained in:
R. Bernstein
2012-01-28 20:56:30 -05:00
parent bf40f778d1
commit f130f66c5d
3 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/driver/mmc/mmc_hl_cmds.c
View File

@@ -78,9 +78,10 @@ mmc_get_disc_erasable(const CdIo_t *p_cdio, bool *b_erasable) {
i_status = mmc_read_disc_information(p_cdio, buf, sizeof(buf),
CDIO_MMC_READ_DISC_INFO_STANDARD, 0);
*b_erasable = (DRIVER_OP_SUCCESS == i_status)
? (*b_erasable = ((buf[2] & 0x10) ? true : false))
: false;
if (DRIVER_OP_SUCCESS == i_status)
*b_erasable = ((buf[2] & 0x10) ? true : false);
else
*b_erasable = false;
return i_status;
}

14
lib/driver/solaris.c
View File

@@ -1,6 +1,6 @@
/*
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2011
Rocky Bernstein <rocky@gnu.org>
2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@
#ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: solaris.c,v 1.12 2008/04/22 15:29:12 karl Exp $";
static char ** cdio_get_devices_solaris_cXtYdZs2(int flag);
#ifdef HAVE_GLOB_H
#include <glob.h>
@@ -101,8 +101,6 @@ typedef struct {
static track_format_t get_track_format_solaris(void *p_user_data,
track_t i_track);
static char ** cdio_get_devices_solaris_cXtYdZs2(int flag);
static access_mode_t
str_to_access_mode_solaris(const char *psz_access_mode)
{
@@ -795,6 +793,7 @@ get_blocksize_solaris (void *p_user_data) {
}
}
#ifdef HAVE_SOLARIS_CDROM
/*!
Return a string containing the default CD device if none is specified.
This call does not assume a fixed default drive address but rather uses
@@ -815,6 +814,7 @@ cdio_get_default_cXtYdZs2(void)
return result;
return strdup(DEFAULT_CDIO_DEVICE);
}
#endif
/*!
Return a string containing the default CD device if none is specified.
@@ -1165,6 +1165,7 @@ close_tray_solaris (const char *psz_device)
#endif /*HAVE_SOLARIS_CDROM*/
}
#ifdef HAVE_SOLARIS_CDROM
/*!
Return an array of strings giving possible CD devices.
New method after demise of vold in 2006.
@@ -1174,9 +1175,6 @@ close_tray_solaris (const char *psz_device)
static char **
cdio_get_devices_solaris_cXtYdZs2(int flag)
{
#ifndef HAVE_SOLARIS_CDROM
return NULL;
#else
int busno, tgtno, lunno, ret;
char volpath[160];
char **drives = NULL;
@@ -1273,8 +1271,8 @@ ex:;
closedir(dir);
cdio_add_device_list(&drives, NULL, &i_files);
return drives;
#endif /*HAVE_SOLARIS_CDROM*/
}
#endif /*HAVE_SOLARIS_CDROM*/
/*!
Return an array of strings giving possible CD devices.

79
test/check_cue.sh.in
View File

@@ -1,5 +1,4 @@
#!/bin/sh
#$Id: check_cue.sh.in,v 1.31 2007/12/28 02:11:01 rocky Exp $
# Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
# (via cd-info).
@@ -7,8 +6,8 @@ if test "@VCDINFO_LIBS@X" != "X" ; then
vcd_opt='--no-vcd'
fi
if test "X$srcdir" = "X" ; then
srcdir=`pwd`
if test "X$abs_top_srcdir" = "X" ; then
abs_top_srcdir=@abs_top_srcdir@
fi
if test "X$top_srcdir" = "X" ; then
@@ -21,7 +20,7 @@ fi
. ${top_builddir}/test/check_common_fn
if test ! -x $top_srcdir/src/cd-info ; then
if test ! -x $abs_top_srcdir/src/cd-info ; then
exit 77
fi
@@ -29,107 +28,107 @@ BASE=`basename $0 .sh`
fname=cdda
testnum=CD-DA
opts="--quiet --no-device-info --cue-file ${srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --cue-file ${abs_top_srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
opts="--quiet --no-device-info --bin-file ${srcdir}/data/${fname}.bin --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --bin-file ${abs_top_srcdir}/data/${fname}.bin --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info BIN test $testnum" "${CD_INFO} $opts"
opts="--quiet --no-device-info --toc-file ${srcdir}/data/${fname}.toc --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --toc-file ${abs_top_srcdir}/data/${fname}.toc --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
fname=cdtext
testnum="CD-Text binary parser"
if test -f ${srcdir}/data/${fname}.bin ; then
if test -f ${srcdir}/data/${fname}.cdt ; then
opts="--quiet --no-device-info --cue-file ${srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
if test -f ${abs_top_srcdir}/data/${fname}.cdt ; then
opts="--quiet --no-device-info --cue-file ${abs_top_srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CD-Text CUE test $testnum" "${CD_INFO} $opts"
else
echo "Don't see CD-Text file ${srcdir}/data/${fname}.cdt. Test $testnum skipped."
echo "Don't see CD-Text file ${abs_top_srcdir}/data/${fname}.cdt. Test $testnum skipped."
fi
else
echo "Don't see binary file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see binary file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fname=isofs-m1
testnum='ISO 9660 mode1 CUE'
if test -f ${srcdir}/data/${fname}.bin ; then
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
if test -n "@HAVE_ROCK@"; then
opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="-q --no-device-info --no-disc-mode --cue-file ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info Rock-Ridge CUE test $testnum" "${CD_INFO} $opts"
opts="-q --no-device-info --no-disc-mode --no-rock-ridge --cue-file ${srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}-no-rr.right
opts="-q --no-device-info --no-disc-mode --no-rock-ridge --cue-file ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}-no-rr.right
RC=$?
check_result $RC "cd-info no Rock-Ridge CUE test $testnum" "${CD_INFO} $opts"
fi
else
echo "Don't see CUE file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see CUE file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
if test -n "@HAVE_ROCK@"; then
testnum='ISO 9660 mode1 TOC'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --toc-file ${srcdir}/data/${fname}.toc --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --toc-file ${abs_top_srcdir}/data/${fname}.toc --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
else
echo "Don't see TOC file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see TOC file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fi
fname=vcd_demo
if test -z "@VCDINFO_LIBS@" ; then
right=${srcdir}/${fname}.right
right=${abs_top_srcdir}/${fname}.right
else
right=${srcdir}/${fname}_vcdinfo.right
right=${abs_top_srcdir}/${fname}_vcdinfo.right
fi
testnum='Video CD'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode -c ${srcdir}/data/${fname}.cue --iso9660"
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode -c ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump $right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
if test -z "@VCDINFO_LIBS@" ; then
right=${srcdir}/${fname}.right
right=${abs_top_srcdir}/${fname}.right
else
right=${srcdir}/${fname}_vcdinfo.right
right=${abs_top_srcdir}/${fname}_vcdinfo.right
fi
opts="-q --no-device-info --no-disc-mode -t ${srcdir}/data/${fname}.toc --iso9660"
if test -f ${srcdir}/${fname}.toc ; then
opts="-q --no-device-info --no-disc-mode -t ${abs_top_srcdir}/data/${fname}.toc --iso9660"
if test -f ${abs_top_srcdir}/${fname}.toc ; then
test_cdinfo "$opts" ${fname}.dump $right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
else
echo "Don't see TOC file ${srcdir}/data/${fname}.toc. Test $testnum skipped."
echo "Don't see TOC file ${abs_top_srcdir}/data/${fname}.toc. Test $testnum skipped."
fi
else
echo "Don't see BIN file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see BIN file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fname=svcd_ogt_test_ntsc
testnum='Super Video CD'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/data/${fname}.cue $vcd_opt --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --cue-file ${abs_top_srcdir}/data/${fname}.cue $vcd_opt --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
else
echo "Don't see CUE file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see CUE file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
exit $RC