Mercurial > mplayer.hg
comparison libmpdvdkit2/css.c @ 20417:cef706926f20
Sync warning fixes from upstream libdvdcss.
author | diego |
---|---|
date | Tue, 24 Oct 2006 17:47:03 +0000 |
parents | c7f0452a93c0 |
children |
comparison
equal
deleted
inserted
replaced
20416:c7f0452a93c0 | 20417:cef706926f20 |
---|---|
168 i_fd = open( dvdcss->psz_cachefile, O_RDONLY ); | 168 i_fd = open( dvdcss->psz_cachefile, O_RDONLY ); |
169 b_cache = 1; | 169 b_cache = 1; |
170 | 170 |
171 if( i_fd >= 0 ) | 171 if( i_fd >= 0 ) |
172 { | 172 { |
173 unsigned char psz_key[KEY_SIZE * 3]; | 173 char psz_key[KEY_SIZE * 3]; |
174 unsigned int k0, k1, k2, k3, k4; | 174 unsigned int k0, k1, k2, k3, k4; |
175 | 175 |
176 psz_key[KEY_SIZE * 3 - 1] = '\0'; | 176 psz_key[KEY_SIZE * 3 - 1] = '\0'; |
177 | 177 |
178 if( read( i_fd, psz_key, KEY_SIZE * 3 - 1 ) == KEY_SIZE * 3 - 1 | 178 if( read( i_fd, psz_key, KEY_SIZE * 3 - 1 ) == KEY_SIZE * 3 - 1 |
217 if( dvdcss->psz_cachefile[0] && b_cache ) | 217 if( dvdcss->psz_cachefile[0] && b_cache ) |
218 { | 218 { |
219 i_fd = open( dvdcss->psz_cachefile, O_RDWR|O_CREAT, 0644 ); | 219 i_fd = open( dvdcss->psz_cachefile, O_RDWR|O_CREAT, 0644 ); |
220 if( i_fd >= 0 ) | 220 if( i_fd >= 0 ) |
221 { | 221 { |
222 unsigned char psz_key[KEY_SIZE * 3 + 2]; | 222 char psz_key[KEY_SIZE * 3 + 2]; |
223 | 223 |
224 sprintf( psz_key, "%02x:%02x:%02x:%02x:%02x\r\n", | 224 sprintf( psz_key, "%02x:%02x:%02x:%02x:%02x\r\n", |
225 p_title_key[0], p_title_key[1], p_title_key[2], | 225 p_title_key[0], p_title_key[1], p_title_key[2], |
226 p_title_key[3], p_title_key[4] ); | 226 p_title_key[3], p_title_key[4] ); |
227 | 227 |