From 7775fa7de57e1f030319752978367102f2cd794e Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@posteo.net>
Date: Mon, 18 Mar 2024 20:44:09 +0100
Subject: [PATCH] sys/tiny_strerror: fix compilation on LLVM

Mixing address spaces is something LLVM doesn't like (for good
reason). This re-organized the code a bit so that this does not
happen anymore, even on AVR.

Split out of https://github.com/RIOT-OS/RIOT/pull/16924
---
 sys/tiny_strerror/tiny_strerror.c | 34 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/sys/tiny_strerror/tiny_strerror.c b/sys/tiny_strerror/tiny_strerror.c
index 501f0733c536..77732f4d7864 100644
--- a/sys/tiny_strerror/tiny_strerror.c
+++ b/sys/tiny_strerror/tiny_strerror.c
@@ -215,37 +215,35 @@ static FLASH_ATTR const char * FLASH_ATTR const lookup[] = {
 
 const char *tiny_strerror(int errnum)
 {
-    /* dark magic: All error strings start with a "-". For positive error codes
-     * an offset of 1 is added to the address of the string, jumping one char
-     * behind the "-". This way the strings do not have to be allocated twice
-     * (once with and once without minus char).
-     */
-    const char *retval = "-unknown";
-    unsigned offset = 1;
-
     if (IS_USED(MODULE_TINY_STRERROR_MINIMAL)) {
         static char buf[4];
         snprintf(buf, sizeof(buf), "%d", errnum);
         return buf;
     }
 
+    /* dark magic: All error strings start with a "-". For positive error codes
+     * an offset of 1 is added to the address of the string, jumping one char
+     * behind the "-". This way the strings do not have to be allocated twice
+     * (once with and once without minus char).
+     */
+    unsigned offset = 1;
     if (errnum <= 0) {
         offset = 0;
         errnum = -errnum;
     }
 
-    if (((unsigned)errnum < ARRAY_SIZE(lookup))
-            && (lookup[(unsigned)errnum] != NULL)) {
-        retval = lookup[(unsigned)errnum];
+    if (((unsigned)errnum >= ARRAY_SIZE(lookup))
+            || (lookup[(unsigned)errnum] == NULL)) {
+        return "unknown";
     }
 
-    if (IS_ACTIVE(HAS_FLASH_UTILS_ARCH)) {
-        static char buf[16];
-        flash_strncpy(buf, retval + offset, sizeof(buf));
-        return buf;
-    }
-
-    return retval + offset;
+#if IS_ACTIVE(HAS_FLASH_UTILS_ARCH)
+    static char buf[16];
+    flash_strncpy(buf, lookup[(unsigned)errnum] + offset, sizeof(buf));
+    return buf;
+#else
+    return lookup[(unsigned)errnum] + offset;
+#endif
 }
 
 #if IS_USED(MODULE_TINY_STRERROR_AS_STRERROR)