Removed dead code + added a check against allocation errors.

[vlc] / modules / access / vcd / cdrom_internals.h

diff --git a/modules/access/vcd/cdrom_internals.h b/modules/access/vcd/cdrom_internals.h
index 77b72dacc19cadd746e9338b431efee51cc15d6b..eef3df09bb75e7bda094c95ea4960f019c277c7f 100644 (file)
--- a/modules/access/vcd/cdrom_internals.h
+++ b/modules/access/vcd/cdrom_internals.h
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -66,7 +66,7 @@ struct vcddev_s
 /*****************************************************************************
  * Platform specifics
  *****************************************************************************/
-#if defined( SYS_DARWIN )
+#if defined( __APPLE__ )
 #define darwin_freeTOC( p ) free( (void*)p )
 #define CD_MIN_TRACK_NO 01
 #define CD_MAX_TRACK_NO 99
@@ -204,9 +204,8 @@ struct SRB_ExecSCSICmd
 static int    OpenVCDImage( vlc_object_t *, const char *, struct vcddev_s * );
 static void   CloseVCDImage( vlc_object_t *, struct vcddev_s * );
 
-#if defined( SYS_DARWIN )
+#if defined( __APPLE__ )
 static CDTOC *darwin_getTOC( vlc_object_t *, const struct vcddev_s * );
-static int    darwin_getNumberOfDescriptors( CDTOC * );
 static int    darwin_getNumberOfTracks( CDTOC *, int );
 
 #elif defined( WIN32 )