diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-06 23:54:29 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-06 23:54:29 +0000 |
| commit | f859d013a883bbba59901303f644fe281454a63d (patch) | |
| tree | e71729f1990b98ab27a8672e92a656d622c5ab19 /libmpdvdkit2 | |
| parent | d1d7c653674e32de3a4aa47ee4068c57b288adb7 (diff) | |
| download | mpv-f859d013a883bbba59901303f644fe281454a63d.tar.bz2 mpv-f859d013a883bbba59901303f644fe281454a63d.tar.xz | |
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
| -rw-r--r-- | libmpdvdkit2/css.c | 2 | ||||
| -rw-r--r-- | libmpdvdkit2/libdvdcss.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmpdvdkit2/css.c b/libmpdvdkit2/css.c index 8e073b150c..83fcec8317 100644 --- a/libmpdvdkit2/css.c +++ b/libmpdvdkit2/css.c @@ -301,7 +301,7 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block ) if(dvdcss->psz_cache){ int fd; key_file=malloc(strlen(dvdcss->psz_cache)+12+4); - sprintf(key_file,"%s/%0.10x",dvdcss->psz_cache,i_block); + sprintf(key_file,"%s/%.10x",dvdcss->psz_cache,i_block); if ( (fd=open( key_file,O_RDONLY ) ) > 0 ){ if(read(fd, p_title_key, 5)==5){ // success! diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c index 4e715f1f5c..2a162c4888 100644 --- a/libmpdvdkit2/libdvdcss.c +++ b/libmpdvdkit2/libdvdcss.c @@ -269,7 +269,7 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) /* if the CACHE is enabled, extract some unique disc ID */ if(dvdcss_cache_dir){ char* disc_id=NULL; - char title_name[64]; + /*char title_name[64];*/ char sector[DVDCSS_BLOCK_SIZE]; // 32768+40 -> disc title (32 uppercase chars) // 32768+813 -> disc manufacturing date + serial no (16 digit number) @@ -289,14 +289,14 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) for ( i=0;i<16;i++ ) if ( ( title_name[i] < '0' )||( title_name[i] > '9' ) ){ disc_id=malloc(16+4); - sprintf( disc_id,"%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X",title_name[0],title_name[1],title_name[2],title_name[3],title_name[4],title_name[5],title_name[6],title_name[7] ); + sprintf( disc_id,"%.2X%.2X%.2X%.2X%.2X%.2X%.2X%.2X",title_name[0],title_name[1],title_name[2],title_name[3],title_name[4],title_name[5],title_name[6],title_name[7] ); break; } if(!disc_id) disc_id=strdup(title_name); } if(disc_id){ // yeah, we have a disc name/id, let's set up cache path: - char* dir; + /*char* dir;*/ dvdcss->psz_cache = malloc(strlen(dvdcss_cache_dir)+strlen(disc_id)+4); sprintf(dvdcss->psz_cache,"%s/%s",dvdcss_cache_dir,disc_id); mkdir( dvdcss->psz_cache,493 ); |