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

Remove gcc 2.95 warnings on BSDI

Browse Source
This commit is contained in:
rocky
2005-03-19 07:28:56 +00:00
parent a5161ab684
commit 140e8cc8c0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/driver/bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: bsdi.c,v 1.6 2005/03/19 06:42:24 rocky Exp $ $Id: bsdi.c,v 1.7 2005/03/19 07:28:56 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: bsdi.c,v 1.6 2005/03/19 06:42:24 rocky Exp $"; static const char _rcsid[] = "$Id: bsdi.c,v 1.7 2005/03/19 07:28:56 rocky Exp $";
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -989,7 +989,6 @@ cdio_open_bsdi (const char *psz_orig_source)
.audio_resume = audio_resume_bsdi, .audio_resume = audio_resume_bsdi,
.audio_set_volume = audio_set_volume_bsdi, .audio_set_volume = audio_set_volume_bsdi,
.audio_stop = audio_stop_bsdi, .audio_stop = audio_stop_bsdi,
.close_tray = close_tray_bsdi,
.eject_media = eject_media_bsdi, .eject_media = eject_media_bsdi,
.free = cdio_generic_free, .free = cdio_generic_free,
.get_arg = _get_arg_bsdi, .get_arg = _get_arg_bsdi,

6
lib/driver/device.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: device.c,v 1.20 2005/03/17 09:01:58 rocky Exp $ $Id: device.c,v 1.21 2005/03/19 07:28:56 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -414,12 +414,12 @@ cdio_get_default_device_driver (/*in/out*/ driver_id_t *p_driver_id)
{ {
if (DRIVER_UNKNOWN == *p_driver_id || DRIVER_DEVICE == *p_driver_id) { if (DRIVER_UNKNOWN == *p_driver_id || DRIVER_DEVICE == *p_driver_id) {
if (DRIVER_UNKNOWN == *p_driver_id) if (DRIVER_UNKNOWN == *p_driver_id)
*p_driver_id++; (*p_driver_id)++;
else else
*p_driver_id = CDIO_MIN_DEVICE_DRIVER; *p_driver_id = CDIO_MIN_DEVICE_DRIVER;
/* Scan for driver */ /* Scan for driver */
for ( ; *p_driver_id<=CDIO_MAX_DRIVER; *p_driver_id++) { for ( ; *p_driver_id<=CDIO_MAX_DRIVER; (*p_driver_id)++) {
if ( (*CdIo_all_drivers[*p_driver_id].have_driver)() && if ( (*CdIo_all_drivers[*p_driver_id].have_driver)() &&
*CdIo_all_drivers[*p_driver_id].get_default_device ) { *CdIo_all_drivers[*p_driver_id].get_default_device ) {
return (*CdIo_all_drivers[*p_driver_id].get_default_device)(); return (*CdIo_all_drivers[*p_driver_id].get_default_device)();