From 5b922c4747c8468ba409b0b2b3cbf027cfd4d7d5 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 7 Aug 2024 00:48:11 -0400
Subject: [PATCH] Cleanups to logging in cdrom_image_backend.c

---
 src/cdrom/cdrom_image_backend.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
index 25085285c..7dcde1cdb 100644
--- a/src/cdrom/cdrom_image_backend.c
+++ b/src/cdrom/cdrom_image_backend.c
@@ -170,25 +170,23 @@ cleanup_error:
 static int
 bin_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
 {
-    track_file_t *tf;
-
-    cdrom_image_backend_log("CDROM: binary_read(%08lx, pos=%" PRIu64 " count=%lu)\n",
-                            tf->fp, seek, count);
+    track_file_t *tf = NULL;
 
     if ((tf = (track_file_t *) priv)->fp == NULL)
         return 0;
 
+    cdrom_image_backend_log("CDROM: binary_read(%08lx, pos=%" PRIu64 " count=%lu)\n",
+                            tf->fp, seek, count);
+
     if (fseeko64(tf->fp, seek, SEEK_SET) == -1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
         cdrom_image_backend_log("CDROM: binary_read failed during seek!\n");
-#endif
+
         return 0;
     }
 
     if (fread(buffer, count, 1, tf->fp) != 1) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
         cdrom_image_backend_log("CDROM: binary_read failed during read!\n");
-#endif
+
         return 0;
     }
 
@@ -207,9 +205,7 @@ bin_read(void *priv, uint8_t *buffer, uint64_t seek, size_t count)
 static uint64_t
 bin_get_length(void *priv)
 {
-    track_file_t *tf;
-
-    cdrom_image_backend_log("CDROM: binary_length(%08lx)\n", tf->fp);
+    track_file_t *tf = NULL;
 
     if ((tf = (track_file_t *) priv)->fp == NULL)
         return 0;
@@ -1159,10 +1155,9 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
                 trk.file = audio_init(filename, &error);
             }
             if (error) {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
                 cdrom_image_backend_log("CUE: cannot open file '%s' in cue sheet!\n",
                                         filename);
-#endif
+
                 if (trk.file != NULL) {
                     trk.file->close(trk.file);
                     trk.file = NULL;
@@ -1177,9 +1172,8 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
             /* Ignored commands. */
             success = 1;
         } else {
-#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG
             cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n", command);
-#endif
+
             success = 0;
         }