Mercurial > mplayer.hg
changeset 20417:cef706926f20
Sync warning fixes from upstream libdvdcss.
author | diego |
---|---|
date | Tue, 24 Oct 2006 17:47:03 +0000 |
parents | c7f0452a93c0 |
children | 5b26bde0cd10 |
files | libmpdvdkit2/css.c libmpdvdkit2/ioctl.h libmpdvdkit2/libdvdcss.c |
diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdvdkit2/css.c Tue Oct 24 17:41:16 2006 +0000 +++ b/libmpdvdkit2/css.c Tue Oct 24 17:47:03 2006 +0000 @@ -170,7 +170,7 @@ if( i_fd >= 0 ) { - unsigned char psz_key[KEY_SIZE * 3]; + char psz_key[KEY_SIZE * 3]; unsigned int k0, k1, k2, k3, k4; psz_key[KEY_SIZE * 3 - 1] = '\0'; @@ -219,7 +219,7 @@ i_fd = open( dvdcss->psz_cachefile, O_RDWR|O_CREAT, 0644 ); if( i_fd >= 0 ) { - unsigned char psz_key[KEY_SIZE * 3 + 2]; + char psz_key[KEY_SIZE * 3 + 2]; sprintf( psz_key, "%02x:%02x:%02x:%02x:%02x\r\n", p_title_key[0], p_title_key[1], p_title_key[2],
--- a/libmpdvdkit2/ioctl.h Tue Oct 24 17:41:16 2006 +0000 +++ b/libmpdvdkit2/ioctl.h Tue Oct 24 17:47:03 2006 +0000 @@ -318,8 +318,8 @@ * win32 aspi specific *****************************************************************************/ -typedef WINAPI DWORD (*GETASPI32SUPPORTINFO)(VOID); -typedef WINAPI DWORD (*SENDASPI32COMMAND)(LPVOID); +typedef DWORD (CALLBACK *GETASPI32SUPPORTINFO)(VOID); +typedef DWORD (CALLBACK *SENDASPI32COMMAND)(LPVOID); #define WIN2K ( GetVersion() < 0x80000000 ) #define ASPI_HAID 0
--- a/libmpdvdkit2/libdvdcss.c Tue Oct 24 17:41:16 2006 +0000 +++ b/libmpdvdkit2/libdvdcss.c Tue Oct 24 17:47:03 2006 +0000 @@ -387,7 +387,7 @@ "# This file is a cache directory tag created by libdvdcss.\r\n" "# For information about cache directory tags, see:\r\n" "# http://www.brynosaurus.com/cachedir/\r\n"; - unsigned char psz_tagfile[PATH_MAX+1+12+1]; + char psz_tagfile[PATH_MAX + 1 + 12 + 1]; int i_fd; sprintf( psz_tagfile, "%s/CACHEDIR.TAG", psz_cache ); @@ -403,9 +403,9 @@ if( psz_cache ) { uint8_t p_sector[DVDCSS_BLOCK_SIZE]; - unsigned char psz_debug[PATH_MAX+30]; - unsigned char psz_key[1 + KEY_SIZE * 2 + 1]; - unsigned char * psz_title, * psz_serial; + char psz_debug[PATH_MAX + 30]; + char psz_key[1 + KEY_SIZE * 2 + 1]; + char *psz_title, *psz_serial; int i; /* We read sector 0. If it starts with 0x000001ba (BE), we are @@ -446,7 +446,7 @@ } /* Get the disc title */ - psz_title = p_sector + 40; + psz_title = (char *)p_sector + 40; psz_title[32] = '\0'; for( i = 0 ; i < 32 ; i++ ) @@ -463,7 +463,7 @@ } /* Get the date + serial */ - psz_serial = p_sector + 813; + psz_serial = (char *)p_sector + 813; psz_serial[16] = '\0'; /* Check that all characters are digits, otherwise convert. */