1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor to use struct string_part

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-02-22 14:50:46 +09:00
parent 97a39ccc2c
commit e1c684e471
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dln.c
View File

@ -107,39 +107,42 @@ dln_loaderror(const char *format, ...)
#endif #endif
#if defined(_WIN32) || defined(USE_DLN_DLOPEN) #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
static size_t struct string_part {
init_funcname_len(const char **file) const char *ptr;
size_t len;
};
static struct string_part
init_funcname_len(const char *file)
{ {
const char *p = *file, *base, *dot = NULL; const char *p = file, *base, *dot = NULL;
/* Load the file as an object one */ /* Load the file as an object one */
for (base = p; *p; p++) { /* Find position of last '/' */ for (base = p; *p; p++) { /* Find position of last '/' */
if (*p == '.' && !dot) dot = p; if (*p == '.' && !dot) dot = p;
if (isdirsep(*p)) base = p+1, dot = NULL; if (isdirsep(*p)) base = p+1, dot = NULL;
} }
*file = base;
/* Delete suffix if it exists */ /* Delete suffix if it exists */
return (dot ? dot : p) - base; const size_t len = (dot ? dot : p) - base;
return (struct string_part){base, len};
} }
static inline char * static inline char *
concat_funcname(char *buf, const char *prefix, size_t plen, const char *base, size_t flen) concat_funcname(char *buf, const char *prefix, size_t plen, const struct string_part base)
{ {
if (!buf) { if (!buf) {
dln_memerror(); dln_memerror();
} }
memcpy(buf, prefix, plen); memcpy(buf, prefix, plen);
memcpy(buf + plen, base, flen); memcpy(buf + plen, base.ptr, base.len);
buf[plen + flen] = '\0'; buf[plen + base.len] = '\0';
return buf; return buf;
} }
#define build_funcname(prefix, buf, file) do {\ #define build_funcname(prefix, buf, file) do {\
const char *base = (file);\ const struct string_part f = init_funcname_len(file);\
const size_t flen = init_funcname_len(&base);\
const size_t plen = sizeof(prefix "") - 1;\ const size_t plen = sizeof(prefix "") - 1;\
char *const tmp = ALLOCA_N(char, plen+flen+1);\ *(buf) = concat_funcname(ALLOCA_N(char, plen+f.len+1), prefix, plen, f);\
*(buf) = concat_funcname(tmp, prefix, plen, base, flen);\
} while (0) } while (0)
#define init_funcname(buf, file) build_funcname(FUNCNAME_PREFIX, buf, file) #define init_funcname(buf, file) build_funcname(FUNCNAME_PREFIX, buf, file)