From 6abf0bbafbf12a0123ed2ab4d371ad363f41e411 Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Tue, 4 Apr 2023 20:49:45 -0300
Subject: [PATCH 1/2] VISO: Attempt fix for clang compiler warning

---
 src/cdrom/cdrom_image_viso.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index d4fc2b2a9..d904b97a4 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -218,7 +218,7 @@ viso_convert_utf8(wchar_t *dest, const char *src, ssize_t buf_size)
     return p - dest;
 }
 
-#define VISO_WRITE_STR_FUNC(func, dst_type, src_type, converter)                    \
+#define VISO_WRITE_STR_FUNC(func, dst_type, src_type, converter, bounds_chk)        \
     static void                                                                     \
     func(dst_type *dest, const src_type *src, ssize_t buf_size, int charset)        \
     {                                                                               \
@@ -284,7 +284,7 @@ viso_convert_utf8(wchar_t *dest, const char *src, ssize_t buf_size)
                                                                                     \
                 default:                                                            \
                     /* Not valid for D or A, but valid for filenames. */            \
-                    if ((charset < VISO_CHARSET_FN) || (c > 0xffff))                \
+                    if ((charset < VISO_CHARSET_FN) || (bounds_chk))                \
                         c = '_';                                                    \
                     break;                                                          \
             }                                                                       \
@@ -293,8 +293,8 @@ viso_convert_utf8(wchar_t *dest, const char *src, ssize_t buf_size)
             *dest++ = converter(c);                                                 \
         }                                                                           \
     }
-VISO_WRITE_STR_FUNC(viso_write_string, uint8_t, char, )
-VISO_WRITE_STR_FUNC(viso_write_wstring, uint16_t, wchar_t, cpu_to_be16)
+VISO_WRITE_STR_FUNC(viso_write_string, uint8_t, char, , 0)
+VISO_WRITE_STR_FUNC(viso_write_wstring, uint16_t, wchar_t, cpu_to_be16, c > 0xffff)
 
 static int
 viso_fill_fn_short(char *data, const viso_entry_t *entry, viso_entry_t **entries)

From 03b0f4c1753dc7bc3f4950f7e49ddbb4bf410ceb Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Thu, 6 Apr 2023 18:54:50 -0300
Subject: [PATCH 2/2] Jenkins: Fix incorrect shortening of directory tree

---
 .ci/Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index b9a095554..d65f774d1 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -283,13 +283,17 @@ pipeline {
 															def archName = archNames[archSlug]
 															if (os == 'macOS')
 																archName = archNamesMac[archSlug]
-															dir("${dynarecNames[dynarec]}/$os - $archName") {
-																ret = runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} $buildFlags")
+															dir(dynarecNames[dynarec]) {
+																dir("$os - $archName") {
+																	ret = runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} $buildFlags")
+																	writeFile file: '.forcedir', text: ''
+																}
+																writeFile file: '.forcedir', text: ''
 															}
 
 															if (ret == 0) {
 																/* Archive resulting artifacts. */
-																archiveArtifacts artifacts: "**/**/$packageName*"
+																archiveArtifacts artifacts: "**/$packageName*, **/.forcedir"
 															} else {
 																/* Fail this stage. */
 																failStage()