Avoid breaking strict-aliasing rules.

diff --git a/src/lib/lightmediascanner_db_audio.c b/src/lib/lightmediascanner_db_audio.c
index 5d3a1c5..5a26d0f 100644 (file)
--- a/src/lib/lightmediascanner_db_audio.c
+++ b/src/lib/lightmediascanner_db_audio.c
@@ -233,8 +233,10 @@ lms_db_audio_t *
 lms_db_audio_new(sqlite3 *db)
 {
     lms_db_audio_t *lda;
+    void *p;
 
-    if (lms_db_cache_get(&_cache, db, (void**)&lda) == 0) {
+    if (lms_db_cache_get(&_cache, db, &p) == 0) {
+        lda = p;
         lda->_references++;
         return lda;
     }

diff --git a/src/lib/lightmediascanner_db_image.c b/src/lib/lightmediascanner_db_image.c
index 2fddb84..d75676b 100644 (file)
--- a/src/lib/lightmediascanner_db_image.c
+++ b/src/lib/lightmediascanner_db_image.c
@@ -83,8 +83,10 @@ lms_db_image_t *
 lms_db_image_new(sqlite3 *db)
 {
     lms_db_image_t *ldi;
+    void *p;
 
-    if (lms_db_cache_get(&_cache, db, (void**)&ldi) == 0) {
+    if (lms_db_cache_get(&_cache, db, &p) == 0) {
+        ldi = p;
         ldi->_references++;
         return ldi;
     }

diff --git a/src/lib/lightmediascanner_db_playlist.c b/src/lib/lightmediascanner_db_playlist.c
index 60d3333..a7dcf1e 100644 (file)
--- a/src/lib/lightmediascanner_db_playlist.c
+++ b/src/lib/lightmediascanner_db_playlist.c
@@ -77,8 +77,10 @@ lms_db_playlist_t *
 lms_db_playlist_new(sqlite3 *db)
 {
     lms_db_playlist_t *ldp;
+    void *p;
 
-    if (lms_db_cache_get(&_cache, db, (void**)&ldp) == 0) {
+    if (lms_db_cache_get(&_cache, db, &p) == 0) {
+        ldp = p;
         ldp->_references++;
         return ldp;
     }

diff --git a/src/lib/lightmediascanner_db_video.c b/src/lib/lightmediascanner_db_video.c
index f2c8903..f891bb9 100644 (file)
--- a/src/lib/lightmediascanner_db_video.c
+++ b/src/lib/lightmediascanner_db_video.c
@@ -90,8 +90,10 @@ lms_db_video_t *
 lms_db_video_new(sqlite3 *db)
 {
     lms_db_video_t *ldv;
+    void *p;
 
-    if (lms_db_cache_get(&_cache, db, (void**)&ldv) == 0) {
+    if (lms_db_cache_get(&_cache, db, &p) == 0) {
+        ldv = p;
         ldv->_references++;
         return ldv;
     }