Diego Elio Pettenò
2013-02-14 11:56:23 UTC
libdvdcss | branch: master | Diego Elio Pettenò <***@flameeyes.eu> | Wed Feb 13 19:01:23 2013 -0800| [efd20464a07fdff475b6cecedb8b743f32efe905] | committer: Jean-Baptiste Kempf
src: mark _dvdcss_titlekey static as it's never used outside of the unit
src/css.c | 4 +++-
src/css.h | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/css.c b/src/css.c
index 1621834..514eaa6 100644
--- a/src/css.c
+++ b/src/css.c
@@ -87,6 +87,8 @@ static int AttackPattern ( uint8_t const[], int, uint8_t * );
static int AttackPadding ( uint8_t const[], int, uint8_t * );
#endif
+static int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t );
+
/*****************************************************************************
* _dvdcss_test: check if the disc is encrypted or not
*****************************************************************************
@@ -406,7 +408,7 @@ int _dvdcss_disckey( dvdcss_t dvdcss )
/*****************************************************************************
* _dvdcss_titlekey: get title key.
*****************************************************************************/
-int _dvdcss_titlekey( dvdcss_t dvdcss, int i_pos, dvd_key_t p_title_key )
+static int _dvdcss_titlekey( dvdcss_t dvdcss, int i_pos, dvd_key_t p_title_key )
{
static uint8_t p_garbage[ DVDCSS_BLOCK_SIZE ]; /* we never read it back */
uint8_t p_key[ KEY_SIZE ];
diff --git a/src/css.h b/src/css.h
index 9e1a594..74a58a3 100644
--- a/src/css.h
+++ b/src/css.h
@@ -57,7 +57,6 @@ typedef struct css_s
int _dvdcss_test ( dvdcss_t );
int _dvdcss_title ( dvdcss_t, int );
int _dvdcss_disckey ( dvdcss_t );
-int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t );
int _dvdcss_unscramble ( uint8_t *, uint8_t * );
#endif /* DVDCSS_CSS_H */
src: mark _dvdcss_titlekey static as it's never used outside of the unit
http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=efd20464a07fdff475b6cecedb8b743f32efe905
---src/css.c | 4 +++-
src/css.h | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/css.c b/src/css.c
index 1621834..514eaa6 100644
--- a/src/css.c
+++ b/src/css.c
@@ -87,6 +87,8 @@ static int AttackPattern ( uint8_t const[], int, uint8_t * );
static int AttackPadding ( uint8_t const[], int, uint8_t * );
#endif
+static int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t );
+
/*****************************************************************************
* _dvdcss_test: check if the disc is encrypted or not
*****************************************************************************
@@ -406,7 +408,7 @@ int _dvdcss_disckey( dvdcss_t dvdcss )
/*****************************************************************************
* _dvdcss_titlekey: get title key.
*****************************************************************************/
-int _dvdcss_titlekey( dvdcss_t dvdcss, int i_pos, dvd_key_t p_title_key )
+static int _dvdcss_titlekey( dvdcss_t dvdcss, int i_pos, dvd_key_t p_title_key )
{
static uint8_t p_garbage[ DVDCSS_BLOCK_SIZE ]; /* we never read it back */
uint8_t p_key[ KEY_SIZE ];
diff --git a/src/css.h b/src/css.h
index 9e1a594..74a58a3 100644
--- a/src/css.h
+++ b/src/css.h
@@ -57,7 +57,6 @@ typedef struct css_s
int _dvdcss_test ( dvdcss_t );
int _dvdcss_title ( dvdcss_t, int );
int _dvdcss_disckey ( dvdcss_t );
-int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t );
int _dvdcss_unscramble ( uint8_t *, uint8_t * );
#endif /* DVDCSS_CSS_H */