From 31875958856c37066b7d32ec904d221c952134ed Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 31 Dec 2024 04:40:14 +0100 Subject: [PATCH] Fixed some warnings. --- src/cdrom/cdrom.c | 4 ++++ src/cdrom/cdrom_image.c | 5 ++++- src/cdrom/cdrom_image_backend.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c index 784b84a39..84a6229bd 100644 --- a/src/cdrom/cdrom.c +++ b/src/cdrom/cdrom.c @@ -1200,7 +1200,9 @@ read_toc_normal(cdrom_t *dev, unsigned char *b, unsigned char start_track, int m } if (s != -1) for (int i = s; i < j; i++) { +#ifdef ENABLE_CDROM_LOG uint8_t *c = &(b[len]); +#endif if (!sony) b[len++] = 0; /* Reserved */ @@ -1235,8 +1237,10 @@ read_toc_normal(cdrom_t *dev, unsigned char *b, unsigned char start_track, int m b[len++] = temp; } +#ifdef ENABLE_CDROM_LOG cdrom_log("Track %02X: %02X %02X %02X %02X %02X %02X %02X %02X\n", i, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]); +#endif } } else b[2] = b[3] = 0; diff --git a/src/cdrom/cdrom_image.c b/src/cdrom/cdrom_image.c index 6e06676f8..f74e0d344 100644 --- a/src/cdrom/cdrom_image.c +++ b/src/cdrom/cdrom_image.c @@ -293,13 +293,16 @@ cdrom_image_open(cdrom_t *dev, const char *fn) dev->seek_pos = 0; dev->cd_buflen = 0; dev->cdrom_capacity = image_get_capacity(dev); - cdrom_image_log("CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n", dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity) << 11ULL); + cdrom_image_log("CD-ROM capacity: %i sectors (%" PRIi64 " bytes)\n", dev->cdrom_capacity, + ((uint64_t) dev->cdrom_capacity) << 11ULL); +#ifdef ENABLE_CDROM_IMAGE_LOG int cm, cs, cf; cf = dev->cdrom_capacity % 75; cs = (dev->cdrom_capacity / 75) % 60; cm = (dev->cdrom_capacity / 75) / 60; cdrom_image_log("CD-ROM capacity: %i sectors (%" PRIi64 " bytes) (time: %02i:%02i:%02i)\n", dev->cdrom_capacity, ((uint64_t) dev->cdrom_capacity - 150ULL) * 2352ULL, cm, cs, cf); +#endif /* Attach this handler to the drive. */ dev->ops = &cdrom_image_ops; diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c index 3e0fa017a..fdc4f662f 100644 --- a/src/cdrom/cdrom_image_backend.c +++ b/src/cdrom/cdrom_image_backend.c @@ -1457,6 +1457,7 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile) prev->indexes[2].length = 0; } +#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG for (int i = 0; i < cdi->tracks_num; i++) { track_t *t = &(cdi->tracks[i]); for (int j = 0; j < 3; j++) { @@ -1472,6 +1473,7 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile) (int) ((ti->start + ti->length - 1) % 75)); } } +#endif return 1; }