[libdvdcss-devel] Restore C89 compatibility

Jean-Baptiste Kempf git at videolan.org
Sun Mar 17 15:40:57 CET 2013


libdvdcss | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 17 15:38:53 2013 +0100| [2ec45471143b43ef20888682d809577c390edb62] | committer: Jean-Baptiste Kempf

Restore C89 compatibility

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

 src/ioctl.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ioctl.c b/src/ioctl.c
index 7e3568e..5221c97 100644
--- a/src/ioctl.c
+++ b/src/ioctl.c
@@ -922,12 +922,13 @@ int ioctl_ReportASF( int i_fd, int *pi_remove_me, int *pi_asf )
         DWORD tmp;
         uint8_t buffer[DVD_ASF_LENGTH] = { 0 };
         PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
+        PDVD_ASF keyData;
 
         key->KeyLength  = DVD_ASF_LENGTH;
         key->KeyType    = DvdAsf;
         key->KeyFlags   = 0;
 
-        PDVD_ASF keyData = (PDVD_ASF)key->KeyData;
+        keyData = (PDVD_ASF)key->KeyData;
         keyData->SuccessFlag = *pi_asf;
 
         i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_DVD_READ_KEY, key,
@@ -1569,6 +1570,7 @@ int ioctl_ReportRPC( int i_fd, int *p_type, int *p_mask, int *p_scheme )
         DWORD tmp;
         uint8_t buffer[DVD_RPC_KEY_LENGTH] = { 0 };
         PDVD_COPY_PROTECT_KEY key = (PDVD_COPY_PROTECT_KEY) &buffer;
+        PDVD_RPC_KEY keyData;
 
         key->KeyLength  = DVD_RPC_KEY_LENGTH;
         key->KeyType    = DvdGetRpcKey;
@@ -1582,7 +1584,7 @@ int ioctl_ReportRPC( int i_fd, int *p_type, int *p_mask, int *p_scheme )
             return i_ret;
         }
 
-        PDVD_RPC_KEY keyData = (PDVD_RPC_KEY)key->KeyData;
+        keyData = (PDVD_RPC_KEY)key->KeyData;
         *p_type = keyData->TypeCode;
         *p_mask = keyData->RegionMask;
         *p_scheme = keyData->RpcScheme;



More information about the libdvdcss-devel mailing list