bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed part of integer types to intN_t

Browse Source
This commit is contained in:
Ianos Gnatiuc
2005-10-22 14:44:25 +00:00
parent 98ed5a2a37
commit 1f4f8695e5
16 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
goldlib/glibc/regex.c
View File

@@ -4275,9 +4275,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
case charset_not:
{
register unsigned char c;
boolean not = (re_opcode_t) *(p - 1) == charset_not;
boolean not_bool = (re_opcode_t) *(p - 1) == charset_not;
DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
DEBUG_PRINT2 ("EXECUTING charset%s.\n", not_bool ? "_not" : "");
PREFETCH ();
c = TRANSLATE (*d); /* The character to match. */
@@ -4286,11 +4286,11 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
bit list is a full 32 bytes long. */
if (c < (unsigned) (*p * BYTEWIDTH)
&& p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
not = !not;
not_bool = !not_bool;
p += 1 + *p;
if (!not) goto fail;
if (!not_bool) goto fail;
SET_REGS_MATCHED ();
d++;
@@ -4759,15 +4759,15 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
else if ((re_opcode_t) p1[3] == charset
|| (re_opcode_t) p1[3] == charset_not)
{
int not = (re_opcode_t) p1[3] == charset_not;
int not_int = (re_opcode_t) p1[3] == charset_not;
if (c < (unsigned char) (p1[4] * BYTEWIDTH)
&& p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
not = !not;
not_int = !not_int;
/* `not' is equal to 1 if c would match, which means
that we can't change to pop_failure_jump. */
if (!not)
if (!not_int)
{
p[-3] = (unsigned char) pop_failure_jump;
DEBUG_PRINT1 (" No match => pop_failure_jump.\n");

2
goldlib/glibc/regex.h
View File

@@ -37,6 +37,8 @@ extern "C" {
# include <stddef.h>
#endif
#include <gdefs.h>
/* The following two types have to be signed and unsigned integer type
wide enough to hold a value of a pointer. For most ANSI compilers
ptrdiff_t and size_t should be likely OK. Still size of these two