[libdvdcss-devel] ioctl: Drop unused parameter from ioctl_ReportASF

Diego Biurrun git at videolan.org
Mon Oct 20 19:14:58 CEST 2014


libdvdcss | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Oct 20 11:59:13 2014 +0200| [e697331a0a9d642e74f451a12421263de9908d75] | committer: Jean-Baptiste Kempf

ioctl: Drop unused parameter from ioctl_ReportASF

This kills a related gcc warning.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=e697331a0a9d642e74f451a12421263de9908d75
---

 src/css.c   |    2 +-
 src/ioctl.c |    2 +-
 src/ioctl.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/css.c b/src/css.c
index 5aeae86..024ffe5 100644
--- a/src/css.c
+++ b/src/css.c
@@ -739,7 +739,7 @@ static int GetASF( dvdcss_t dvdcss )
 {
     int i_asf = 0;
 
-    if( ioctl_ReportASF( dvdcss->i_fd, NULL, &i_asf ) != 0 )
+    if( ioctl_ReportASF( dvdcss->i_fd, &i_asf ) != 0 )
     {
         /* The ioctl process has failed */
         print_error( dvdcss, "GetASF fatal error" );
diff --git a/src/ioctl.c b/src/ioctl.c
index 5221c97..00b8449 100644
--- a/src/ioctl.c
+++ b/src/ioctl.c
@@ -852,7 +852,7 @@ int ioctl_ReportChallenge( int i_fd, int *pi_agid, uint8_t *p_challenge )
 /*****************************************************************************
  * ioctl_ReportASF: get ASF from the drive
  *****************************************************************************/
-int ioctl_ReportASF( int i_fd, int *pi_remove_me, int *pi_asf )
+int ioctl_ReportASF( int i_fd, int *pi_asf )
 {
     int i_ret;
 
diff --git a/src/ioctl.h b/src/ioctl.h
index 8533833..a56c637 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -29,7 +29,7 @@ int ioctl_ReadTitleKey      ( int, int *, int, uint8_t * );
 int ioctl_ReportAgid        ( int, int * );
 int ioctl_ReportChallenge   ( int, int *, uint8_t * );
 int ioctl_ReportKey1        ( int, int *, uint8_t * );
-int ioctl_ReportASF         ( int, int *, int * );
+int ioctl_ReportASF         ( int, int * );
 int ioctl_InvalidateAgid    ( int, int * );
 int ioctl_SendChallenge     ( int, int *, uint8_t * );
 int ioctl_SendKey2          ( int, int *, uint8_t * );



More information about the libdvdcss-devel mailing list