mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use memrchr if available

This commit is contained in:
Arun Prakash Jana 2020-04-26 01:03:17 +05:30
parent c732de32e4
commit 99d21531b4
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nnn.c
View File

@ -926,7 +926,7 @@ static size_t xstrsncpy(char *restrict dst, const char *restrict src, size_t n)
return end - dst; return end - dst;
} }
static inline size_t xstrlen(const char *s) static inline size_t xstrlen(const char *restrict s)
{ {
#if !defined(__GLIBC__) #if !defined(__GLIBC__)
return strlen(s); // NOLINT return strlen(s); // NOLINT
@ -935,7 +935,7 @@ static inline size_t xstrlen(const char *s)
#endif #endif
} }
static char *xstrdup(const char *s) static char *xstrdup(const char *restrict s)
{ {
size_t len = xstrlen(s) + 1; size_t len = xstrlen(s) + 1;
char *ptr = malloc(len); char *ptr = malloc(len);
@ -965,8 +965,12 @@ static bool is_suffix(const char *str, const char *suffix)
* And we are NOT expecting a '/' at the end. * And we are NOT expecting a '/' at the end.
* Ideally 0 < n <= xstrlen(s). * Ideally 0 < n <= xstrlen(s).
*/ */
static void *xmemrchr(uchar *s, uchar ch, size_t n) static void *xmemrchr(uchar *restrict s, uchar ch, size_t n)
{ {
#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
return memrchr(s, ch, n);
#else
if (!s || !n) if (!s || !n)
return NULL; return NULL;
@ -978,6 +982,7 @@ static void *xmemrchr(uchar *s, uchar ch, size_t n)
while (s != ptr); while (s != ptr);
return NULL; return NULL;
#endif
} }
/* Assumes both the paths passed are directories */ /* Assumes both the paths passed are directories */