[libdvdcss-devel] Eliminate some pointless void* casts

[Diego Biurrun]

libdvdcss | branch: master | Diego Biurrun <***@biurrun.de> | Mon Oct 20 11:59:12 2014 +0200| [6e4231b530c0969103f839c5a03a13e78e32a0a1] | committer: Jean-Baptiste Kempf

Eliminate some pointless void* casts

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=6e4231b530c0969103f839c5a03a13e78e32a0a1

---

src/device.c | 2 +-
src/libdvdcss.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/device.c b/src/device.c
index f78ffc0..61dcdf4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -635,7 +635,7 @@ static int aspi_open( dvdcss_t dvdcss, char const * psz_device )
}
else
{
- free( (void*) fd );
+ free( fd );
FreeLibrary( hASPI );
print_error( dvdcss,"this is not a CD-ROM drive" );
return -1;
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index d357e59..0cea3cd 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -632,7 +632,7 @@ LIBDVDCSS_EXPORT int dvdcss_read ( dvdcss_t dvdcss, void *p_buffer,
/* or fail completely? return 0; */
break;
}
- p_buffer = (void *) ((uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE);
+ p_buffer = (uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE;
}
}
else
@@ -642,7 +642,7 @@ LIBDVDCSS_EXPORT int dvdcss_read ( dvdcss_t dvdcss, void *p_buffer,
{
_dvdcss_unscramble( dvdcss->css.p_title_key, p_buffer );
((uint8_t*)p_buffer)[0x14] &= 0x8f;
- p_buffer = (void *) ((uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE);
+ p_buffer = (uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE;
}
}

[Diego Biurrun]

libdvdcss | branch: master | Diego Biurrun <***@biurrun.de> | Mon Oct 20 11:59:12 2014 +0200| [fde3c32f399a0b4b98a68eb9e95b8eaed76732dd] | committer: Diego Biurrun

Eliminate some pointless void* casts

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

---

src/device.c | 2 +-
src/libdvdcss.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/device.c b/src/device.c
index 2f4ae1d..d101b1c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -635,7 +635,7 @@ static int aspi_open( dvdcss_t dvdcss, char const * psz_device )
}
else
{
- free( (void*) fd );
+ free( fd );
FreeLibrary( hASPI );
print_error( dvdcss,"this is not a CD-ROM drive" );
return -1;
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index daa28bb..22a0053 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -632,7 +632,7 @@ LIBDVDCSS_EXPORT int dvdcss_read ( dvdcss_t dvdcss, void *p_buffer,
/* or fail completely? return 0; */
break;
}
- p_buffer = (void *) ((uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE);
+ p_buffer = (uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE;
}
}
else
@@ -642,7 +642,7 @@ LIBDVDCSS_EXPORT int dvdcss_read ( dvdcss_t dvdcss, void *p_buffer,
{
_dvdcss_unscramble( dvdcss->css.p_title_key, p_buffer );
((uint8_t*)p_buffer)[0x14] &= 0x8f;
- p_buffer = (void *) ((uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE);
+ p_buffer = (uint8_t *)p_buffer + DVDCSS_BLOCK_SIZE;
}
}