projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: update copyright
[gnulib.git]
/
lib
/
regex_internal.c
diff --git
a/lib/regex_internal.c
b/lib/regex_internal.c
index
cac0190
..
0343ee6
100644
(file)
--- a/
lib/regex_internal.c
+++ b/
lib/regex_internal.c
@@
-1,5
+1,5
@@
/* Extended regular expression matching and search library.
/* Extended regular expression matching and search library.
- Copyright (C) 2002-201
2
Free Software Foundation, Inc.
+ Copyright (C) 2002-201
4
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@
-834,7
+834,7
@@
re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
}
static unsigned char
}
static unsigned char
-internal_function __attribute ((pure))
+internal_function __attribute
__
((pure))
re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
{
int ch;
re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
{
int ch;
@@
-1354,7
+1354,7
@@
re_node_set_insert_last (re_node_set *set, Idx elem)
Return true if SET1 and SET2 are equivalent. */
static bool
Return true if SET1 and SET2 are equivalent. */
static bool
-internal_function __attribute ((pure))
+internal_function __attribute
__
((pure))
re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
{
Idx i;
re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
{
Idx i;
@@
-1369,7
+1369,7
@@
re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */
static Idx
/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */
static Idx
-internal_function __attribute ((pure))
+internal_function __attribute
__
((pure))
re_node_set_contains (const re_node_set *set, Idx elem)
{
__re_size_t idx, right, mid;
re_node_set_contains (const re_node_set *set, Idx elem)
{
__re_size_t idx, right, mid;
@@
-1443,11
+1443,9
@@
re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0;
#ifdef RE_ENABLE_I18N
dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0;
#ifdef RE_ENABLE_I18N
- {
- int type = token.type;
dfa->nodes[dfa->nodes_len].accept_mb =
dfa->nodes[dfa->nodes_len].accept_mb =
- (
type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
- }
+ (
(token.type == OP_PERIOD && dfa->mb_cur_max > 1)
+ || token.type == COMPLEX_BRACKET);
#endif
dfa->nexts[dfa->nodes_len] = REG_MISSING;
re_node_set_init_empty (dfa->edests + dfa->nodes_len);
#endif
dfa->nexts[dfa->nodes_len] = REG_MISSING;
re_node_set_init_empty (dfa->edests + dfa->nodes_len);