From cc3b44f7ba461a501a40f290138c4c572605198c Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Mon, 15 Jul 2019 17:16:19 -0400
Subject: [PATCH] cdrom: fix warnings, use dot for frame notation in disc info

---
 libretro-common/cdrom/cdrom.c | 33 ++++++++++++++++++---------------
 menu/menu_displaylist.c       |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/libretro-common/cdrom/cdrom.c b/libretro-common/cdrom/cdrom.c
index b01041de91..9ee5005c0c 100644
--- a/libretro-common/cdrom/cdrom.c
+++ b/libretro-common/cdrom/cdrom.c
@@ -838,7 +838,6 @@ static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsig
    /* MMC Command: READ TRACK INFORMATION */
    unsigned char cdb[] = {0x52, 0x1, 0, 0, 0, 0, 0, 0x1, 0x80, 0};
    unsigned char buf[384] = {0};
-   unsigned char mode = 0;
    unsigned lba = 0;
    unsigned track_size = 0;
    int rv;
@@ -869,7 +868,7 @@ static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsig
 #ifdef CDROM_DEBUG
    printf("[CDROM] Track %d Info: ", track);
    printf("[CDROM] Copy: %d ", (buf[5] & 0x10) > 0);
-   printf("[CDROM] Data Mode: %d ", mode);
+   printf("[CDROM] Data Mode: %d ", toc->track[track - 1].mode);
    printf("[CDROM] LBA Start: %d (%d) ", lba, toc->track[track - 1].lba);
    printf("[CDROM] Track Size: %d\n", track_size);
    fflush(stdout);
@@ -1482,7 +1481,7 @@ bool cdrom_set_read_cache(const libretro_vfs_implementation_file *stream, bool e
 bool cdrom_get_timeouts(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts)
 {
    /* MMC Command: MODE SENSE (10) */
-   int rv, i;
+   int rv;
    unsigned char cdb[]   = {0x5A, 0, 0x1D, 0, 0, 0, 0, 0, 0x14, 0};
    unsigned char buf[20] = {0};
    unsigned short g1     = 0;
@@ -1507,20 +1506,24 @@ bool cdrom_get_timeouts(libretro_vfs_implementation_file *stream, cdrom_group_ti
    g3 = buf[18] << 8 | buf[19];
 
 #ifdef CDROM_DEBUG
-   printf("Mode sense data for timeout groups: ");
-
-   for (i = 0; i < (int)sizeof(buf); i++)
    {
-      printf("%02X ", buf[i]);
+      int i;
+
+      printf("Mode sense data for timeout groups: ");
+
+      for (i = 0; i < (int)sizeof(buf); i++)
+      {
+         printf("%02X ", buf[i]);
+      }
+
+      printf("\n");
+
+      printf("Group 1 Timeout: %d\n", g1);
+      printf("Group 2 Timeout: %d\n", g2);
+      printf("Group 3 Timeout: %d\n", g3);
+
+      fflush(stdout);
    }
-
-   printf("\n");
-
-   printf("Group 1 Timeout: %d\n", g1);
-   printf("Group 2 Timeout: %d\n", g2);
-   printf("Group 3 Timeout: %d\n", g3);
-
-   fflush(stdout);
 #endif
 
    timeouts->g1_timeout = g1;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 9c04abe985..babb92abcd 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5144,7 +5144,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 
                            cdrom_lba_to_msf(toc->track[i].track_size, &min, &sec, &frame);
 
-                           snprintf(length_string + strlen(length_string), sizeof(length_string) - strlen(length_string), "%02d:%02d:%02d", min, sec, frame);
+                           snprintf(length_string + strlen(length_string), sizeof(length_string) - strlen(length_string), "%02d:%02d.%02d", min, sec, frame);
 
                            menu_entries_append_enum(info->list,
                                  length_string,