# HG changeset patch # User diego # Date 1266856323 0 # Node ID fbd6ba7e0e1457d965aed8905b22f9449817cbf5 # Parent 44837471a711b0a339fc2a5aec1a3f9cfa95bc44 Mark vcd_get_track_end () and vcd_read_toc() as static. They are only used within the respective files. diff -r 44837471a711 -r fbd6ba7e0e14 stream/vcd_read.h --- a/stream/vcd_read.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read.h Mon Feb 22 16:32:03 2010 +0000 @@ -72,7 +72,7 @@ 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 = tracktochdr.cdth_trk1?(track+1):CDROM_LEADOUT; if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) { @@ -82,7 +82,7 @@ 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; diff -r 44837471a711 -r fbd6ba7e0e14 stream/vcd_read_darwin.h --- a/stream/vcd_read_darwin.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_darwin.h Mon Feb 22 16:32:03 2010 +0000 @@ -86,7 +86,7 @@ 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 @@ 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; diff -r 44837471a711 -r fbd6ba7e0e14 stream/vcd_read_fbsd.h --- a/stream/vcd_read_fbsd.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_fbsd.h Mon Feb 22 16:32:03 2010 +0000 @@ -144,7 +144,7 @@ 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 @@ 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; diff -r 44837471a711 -r fbd6ba7e0e14 stream/vcd_read_win32.h --- a/stream/vcd_read_win32.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_win32.h Mon Feb 22 16:32:03 2010 +0000 @@ -63,14 +63,14 @@ 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;