diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-24 17:47:03 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-24 17:47:03 +0000 |
| commit | 93b739de4b1075028cf93283b12f381527d2d6bf (patch) | |
| tree | 66bb54835e870d690a43b84897bd97b1725823d2 /libmpdvdkit2 | |
| parent | ca83fb06180a64e5acab460f476914dc43c13cce (diff) | |
| download | mpv-93b739de4b1075028cf93283b12f381527d2d6bf.tar.bz2 mpv-93b739de4b1075028cf93283b12f381527d2d6bf.tar.xz | |
Sync warning fixes from upstream libdvdcss.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20433 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
| -rw-r--r-- | libmpdvdkit2/css.c | 4 | ||||
| -rw-r--r-- | libmpdvdkit2/ioctl.h | 4 | ||||
| -rw-r--r-- | libmpdvdkit2/libdvdcss.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libmpdvdkit2/css.c b/libmpdvdkit2/css.c index 8bbe4fdaa0..a704a3fcf9 100644 --- a/libmpdvdkit2/css.c +++ b/libmpdvdkit2/css.c @@ -170,7 +170,7 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block ) 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 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block ) 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], diff --git a/libmpdvdkit2/ioctl.h b/libmpdvdkit2/ioctl.h index dae4ece121..15595e2569 100644 --- a/libmpdvdkit2/ioctl.h +++ b/libmpdvdkit2/ioctl.h @@ -318,8 +318,8 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT * 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 diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c index c272f28e3a..3bb6dfa6cb 100644 --- a/libmpdvdkit2/libdvdcss.c +++ b/libmpdvdkit2/libdvdcss.c @@ -387,7 +387,7 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) "# 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 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) 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 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) } /* 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 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) } /* 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. */ |