[MPlayer-cvslog] r30712 - in trunk/stream: vcd_read.h vcd_read_darwin.h vcd_read_fbsd.h vcd_read_win32.h

[diego]

Author: diego
Date: Mon Feb 22 17:32:03 2010
New Revision: 30712

Log:
Mark vcd_get_track_end () and vcd_read_toc() as static.
They are only used within the respective files.

Modified:
   trunk/stream/vcd_read.h
   trunk/stream/vcd_read_darwin.h
   trunk/stream/vcd_read_fbsd.h
   trunk/stream/vcd_read_win32.h

Modified: trunk/stream/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	Mon Feb 22 16:35:53 2010	(r30711)
+++ trunk/stream/vcd_read.h	Mon Feb 22 17:32:03 2010	(r30712)
@@ -72,7 +72,7 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd
   return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){
+static int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){
   vcd->entry.cdte_format = CDROM_MSF;
   vcd->entry.cdte_track  = track<vcd->tochdr.cdth_trk1?(track+1):CDROM_LEADOUT;
   if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {
@@ -82,7 +82,7 @@ int vcd_get_track_end(mp_vcd_priv_t* vcd
   return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-mp_vcd_priv_t* vcd_read_toc(int fd){
+static mp_vcd_priv_t* vcd_read_toc(int fd){
   struct cdrom_tochdr tochdr;
   mp_vcd_priv_t* vcd;
   int i, min = 0, sec = 0, frame = 0;

Modified: trunk/stream/vcd_read_darwin.h
==============================================================================
--- trunk/stream/vcd_read_darwin.h	Mon Feb 22 16:35:53 2010	(r30711)
+++ trunk/stream/vcd_read_darwin.h	Mon Feb 22 17:32:03 2010	(r30712)
@@ -86,7 +86,7 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd
 	return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-int vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
+static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
 {
 	struct CDTrackInfo entry;
 
@@ -117,7 +117,7 @@ int vcd_get_track_end(mp_vcd_priv_t* vcd
 	return VCD_SECTOR_DATA*vcd_get_msf(vcd);
 }
 
-mp_vcd_priv_t* vcd_read_toc(int fd)
+static mp_vcd_priv_t* vcd_read_toc(int fd)
 {
 	dk_cd_read_disc_info_t tochdr;
 	struct CDDiscInfo hdr;

Modified: trunk/stream/vcd_read_fbsd.h
==============================================================================
--- trunk/stream/vcd_read_fbsd.h	Mon Feb 22 16:35:53 2010	(r30711)
+++ trunk/stream/vcd_read_fbsd.h	Mon Feb 22 17:32:03 2010	(r30712)
@@ -144,7 +144,7 @@ vcd_seek_to_track(mp_vcd_priv_t* vcd, in
   return VCD_SECTOR_DATA * vcd_get_msf(vcd);
 }
 
-int
+static int
 vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
 {
   if (!read_toc_entry(vcd,
@@ -153,7 +153,7 @@ vcd_get_track_end(mp_vcd_priv_t* vcd, in
   return VCD_SECTOR_DATA * vcd_get_msf(vcd);
 }
 
-mp_vcd_priv_t*
+static mp_vcd_priv_t*
 vcd_read_toc(int fd)
 {
   struct ioc_toc_header tochdr;

Modified: trunk/stream/vcd_read_win32.h
==============================================================================
--- trunk/stream/vcd_read_win32.h	Mon Feb 22 16:35:53 2010	(r30711)
+++ trunk/stream/vcd_read_win32.h	Mon Feb 22 17:32:03 2010	(r30712)
@@ -63,14 +63,14 @@ int vcd_seek_to_track(mp_vcd_priv_t* vcd
     return VCD_SECTOR_DATA * (sect + 2);
 }
 
-int vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
+static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
 {
     if (track < vcd->toc.FirstTrack || track > vcd->toc.LastTrack)
 	return -1;
     return VCD_SECTOR_DATA * (vcd_get_msf(vcd, track + 1));
 }
 
-mp_vcd_priv_t* vcd_read_toc(int fd)
+static mp_vcd_priv_t* vcd_read_toc(int fd)
 {
     DWORD dwBytesReturned;
     HANDLE hd;