comparison libdvdcss/libdvdcss.c @ 23707:552963611d77

Fix CSS format strings, they could print more than two digits for "negative" numbers.
author reimar
date Fri, 06 Jul 2007 22:07:35 +0000
parents e68f255d7d64
children 1fb5f0b13a1a
comparison
equal deleted inserted replaced
23706:088fa7bde511 23707:552963611d77
470 { 470 {
471 if( psz_serial[i] < '0' || psz_serial[i] > '9' ) 471 if( psz_serial[i] < '0' || psz_serial[i] > '9' )
472 { 472 {
473 char psz_tmp[16 + 1]; 473 char psz_tmp[16 + 1];
474 sprintf( psz_tmp, 474 sprintf( psz_tmp,
475 "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", 475 "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"",
476 psz_serial[0], psz_serial[1], psz_serial[2], 476 psz_serial[0], psz_serial[1], psz_serial[2],
477 psz_serial[3], psz_serial[4], psz_serial[5], 477 psz_serial[3], psz_serial[4], psz_serial[5],
478 psz_serial[6], psz_serial[7] ); 478 psz_serial[6], psz_serial[7] );
479 memcpy( psz_serial, psz_tmp, 16 ); 479 memcpy( psz_serial, psz_tmp, 16 );
480 break; 480 break;
486 if( dvdcss->b_scrambled ) 486 if( dvdcss->b_scrambled )
487 { 487 {
488 psz_key[0] = '-'; 488 psz_key[0] = '-';
489 for( i = 0; i < KEY_SIZE; i++ ) 489 for( i = 0; i < KEY_SIZE; i++ )
490 { 490 {
491 sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] ); 491 sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] );
492 } 492 }
493 psz_key[1 + KEY_SIZE * 2] = '\0'; 493 psz_key[1 + KEY_SIZE * 2] = '\0';
494 } 494 }
495 else 495 else
496 { 496 {