mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to avoid strdup to avoid portability issues

Browse Source
This commit is contained in:
libretroadmin 2024-06-29 03:46:06 +02:00
parent 40c889b562
commit 47ec7c0782
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libretro-common/include/array/rhmap.h
View File

@ -104,7 +104,7 @@
#include <string.h> /* for memcpy, memset */ #include <string.h> /* for memcpy, memset */
#include <stddef.h> /* for ptrdiff_t, size_t */ #include <stddef.h> /* for ptrdiff_t, size_t */
#include <stdint.h> /* for uint32_t */ #include <stdint.h> /* for uint32_t */
#include <string.h> /* for strdup */ #include <string.h> /* for strlen */
#define RHMAP_LEN(b) ((b) ? RHMAP__HDR(b)->len : 0) #define RHMAP_LEN(b) ((b) ? RHMAP__HDR(b)->len : 0)
#define RHMAP_MAX(b) ((b) ? RHMAP__HDR(b)->maxlen : 0) #define RHMAP_MAX(b) ((b) ? RHMAP__HDR(b)->maxlen : 0)
@ -261,7 +261,21 @@ RHMAP__UNUSED static ptrdiff_t rhmap__idx(struct rhmap__hdr* hdr, uint32_t key,
} }
if (!hdr->keys[i]) if (!hdr->keys[i])
{ {
if (add) { hdr->len++; hdr->keys[i] = key; if (str) hdr->key_strs[i] = strdup(str); return (ptrdiff_t)i; } if (add)
{
int l;
char *t;
hdr->len++;
hdr->keys[i] = key;
l = strlen(str);
t = malloc(l + 1);
memcpy(t, s, l);
t[l] = '\0';
if (str)
hdr->key_strs[i] = t;
return (ptrdiff_t)i;
}
return (ptrdiff_t)-1; return (ptrdiff_t)-1;
} }
} }