From bcd12099c77f17bd1541ef6eb87f85e3d37ee0f0 Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sat, 9 Jul 2022 13:43:13 -0300
Subject: [PATCH] Virtual ISO: Use the actual basename function and remove the
 legacy one

---
 src/cdrom/cdrom_image_viso.c |  2 +-
 src/qt/qt_platform.cpp       |  7 -------
 src/unix/unix.c              | 13 -------------
 src/win/win.c                | 16 ----------------
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index f3b21db38..ee5bfb268 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -902,7 +902,7 @@ next_dir:
     tz_offset  = (now - mktime(gmtime(&now))) / (3600 / 4);
 
     /* Get root directory basename for the volume ID. */
-    char *basename = plat_get_basename(dirname);
+    char *basename = path_get_filename(viso->root_dir->path);
     if (!basename || (basename[0] == '\0'))
         basename = EMU_NAME;
 
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp
index 35612ca72..2bca0248e 100644
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -194,13 +194,6 @@ plat_getcwd(char *bufp, int max)
     return 0;
 }
 
-char *
-plat_get_basename(const char *path)
-{
-    QFileInfo fi(path);
-    return fi.fileName().toUtf8().data();
-}
-
 void
 path_get_dirname(char *dest, const char *path)
 {
diff --git a/src/unix/unix.c b/src/unix/unix.c
index 3ab5d46e6..9db231790 100644
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -326,19 +326,6 @@ plat_put_backslash(char *s)
 
 /* Return the last element of a pathname. */
 char *
-plat_get_basename(const char *path)
-{
-    int c = (int)strlen(path);
-
-    while (c > 0) {
-	if (path[c] == '/')
-	   return((char *)&path[c + 1]);
-       c--;
-    }
-
-    return((char *)path);
-}
-char *
 path_get_filename(char *s)
 {
     int c = strlen(s) - 1;
diff --git a/src/win/win.c b/src/win/win.c
index 382c58b70..ee8506b89 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -764,22 +764,6 @@ path_abs(char *path)
 }
 
 
-/* Return the last element of a pathname. */
-char *
-plat_get_basename(const char *path)
-{
-    int c = (int)strlen(path);
-
-    while (c > 0) {
-	if (path[c] == '/' || path[c] == '\\')
-	   return((char *)&path[c + 1]);
-       c--;
-    }
-
-    return((char *)path);
-}
-
-
 /* Return the 'directory' element of a pathname. */
 void
 path_get_dirname(char *dest, const char *path)