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

Use a macro for digit check

This commit is contained in:
Arun Prakash Jana 2019-02-05 19:29:59 +05:30
parent 4016eaeeb3
commit b716cac0c9
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nnn.c
View File

@ -218,6 +218,8 @@ disabledbg()
#define setdirwatch() (cfg.filtermode ? (presel = FILTER) : (dir_changed = TRUE)) #define setdirwatch() (cfg.filtermode ? (presel = FILTER) : (dir_changed = TRUE))
/* We don't care about the return value from strcmp() */ /* We don't care about the return value from strcmp() */
#define xstrcmp(a, b) (*(a) != *(b) ? -1 : strcmp((a), (b))) #define xstrcmp(a, b) (*(a) != *(b) ? -1 : strcmp((a), (b)))
/* A faster version of xisdigit */
#define xisdigit(c) ((unsigned int) (c) - '0' <= 9)
#ifdef LINUX_INOTIFY #ifdef LINUX_INOTIFY
#define EVENT_SIZE (sizeof(struct inotify_event)) #define EVENT_SIZE (sizeof(struct inotify_event))
@ -751,7 +753,7 @@ static uint xatoi(const char *str)
if (!str) if (!str)
return 0; return 0;
while (*str >= '0' && *str <= '9') while (xisdigit(*str))
{ {
val = val * 10 + (*str - '0'); val = val * 10 + (*str - '0');
++str; ++str;
@ -1126,7 +1128,7 @@ static int xstricmp(const char * const s1, const char * const s2)
++c2; ++c2;
} }
if ((*c1 >= '0' && *c1 <= '9') && (*c2 >= '0' && *c2 <= '9')) { if (xisdigit(*c1) && xisdigit(*c2)) {
while (*c1 == '0') while (*c1 == '0')
++c1; ++c1;
m1 = c1; m1 = c1;
@ -1135,14 +1137,14 @@ static int xstricmp(const char * const s1, const char * const s2)
++c2; ++c2;
m2 = c2; m2 = c2;
while (*c1 >= '0' && *c1 <= '9') { while (xisdigit(*c1)) {
++count1; ++count1;
++c1; ++c1;
} }
while (isspace(*c1)) while (isspace(*c1))
++c1; ++c1;
while (*c2 >= '0' && *c2 <= '9') { while (xisdigit(*c2)) {
++count2; ++count2;
++c2; ++c2;
} }
@ -1177,7 +1179,7 @@ static int xstricmp(const char * const s1, const char * const s2)
/* Return the integer value of a char representing HEX */ /* Return the integer value of a char representing HEX */
static char xchartohex(char c) static char xchartohex(char c)
{ {
if (c >= '0' && c <= '9') if (xisdigit(c))
return c - '0'; return c - '0';
c = TOUPPER(c); c = TOUPPER(c);