AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring:

Browse Source 
* posix/wordexp.c (CHAR_IN_SET): New macro.
	(parse_param): Use it.
This commit is contained in:
Paul Pluzhnikov 2015-03-09 14:41:35 -07:00
parent d439bc56e1
commit 01d032e0bb
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-09 Paul Pluzhnikov <ppluzhnikov@google.com>
* posix/wordexp.c (CHAR_IN_SET): New macro.
(parse_param): Use it.
2015-03-09 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/fpu/libm-test-ulps: update.

10
posix/wordexp.c
View File

@ -1218,6 +1218,9 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
return WRDE_SYNTAX;
}
#define CHAR_IN_SET(ch, char_set) \
(memchr (char_set "", ch, sizeof (char_set) - 1) != NULL)
static int
internal_function
parse_param (char **word, size_t *word_length, size_t *max_length,
@ -1299,7 +1302,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
}
while (isdigit(words[++*offset]));
}
else if (words[*offset] != '\0' && strchr ("*@$", words[*offset]) != NULL)
else if (CHAR_IN_SET (words[*offset], "*@$"))
{
/* Special parameter. */
special = 1;
@ -1343,8 +1346,7 @@ parse_param (char **word, size_t *word_length, size_t *max_length,
break;
case ':':
if (words[1 + *offset] == '\0'
|| strchr ("-=?+", words[1 + *offset]) == NULL)
if (!CHAR_IN_SET (words[1 + *offset], "-=?+"))
goto syntax;
colon_seen = 1;
@ -2046,6 +2048,8 @@ do_error:
return error;
}
#undef CHAR_IN_SET
static int
internal_function
parse_dollars (char **word, size_t *word_length, size_t *max_length,