From 140e8cc8c09630ae93e07c72a7678bd6b5222577 Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Sat, 19 Mar 2005 07:28:56 +0000
Subject: [PATCH] Remove gcc 2.95 warnings on BSDI

---
 lib/driver/bsdi.c   | 5 ++---
 lib/driver/device.c | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/driver/bsdi.c b/lib/driver/bsdi.c
index 6085084d..41c35eae 100644
--- a/lib/driver/bsdi.c
+++ b/lib/driver/bsdi.c
@@ -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) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
 # include "config.h"
 #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/sector.h>
@@ -989,7 +989,6 @@ cdio_open_bsdi (const char *psz_orig_source)
     .audio_resume          = audio_resume_bsdi,
     .audio_set_volume      = audio_set_volume_bsdi,
     .audio_stop            = audio_stop_bsdi,
-    .close_tray            = close_tray_bsdi,
     .eject_media           = eject_media_bsdi,
     .free                  = cdio_generic_free,
     .get_arg               = _get_arg_bsdi,
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 76503d46..13cbf9fd 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -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>
 
@@ -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) 
-      *p_driver_id++;
+      (*p_driver_id)++;
     else 
       *p_driver_id = CDIO_MIN_DEVICE_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)() &&
            *CdIo_all_drivers[*p_driver_id].get_default_device ) {
         return (*CdIo_all_drivers[*p_driver_id].get_default_device)();