diff options
Diffstat (limited to 'src/include/regex')
| -rw-r--r-- | src/include/regex/cdefs.h | 12 | ||||
| -rw-r--r-- | src/include/regex/regex.h | 9 | ||||
| -rw-r--r-- | src/include/regex/regex2.h | 14 | ||||
| -rw-r--r-- | src/include/regex/regexp.h | 2 |
4 files changed, 18 insertions, 19 deletions
diff --git a/src/include/regex/cdefs.h b/src/include/regex/cdefs.h index 8493c2563c7..69f9128f45a 100644 --- a/src/include/regex/cdefs.h +++ b/src/include/regex/cdefs.h @@ -55,7 +55,7 @@ /* * @(#)cdefs.h 8.1 (Berkeley) 6/2/93 - * $Id: cdefs.h,v 1.3 1997/09/07 05:00:14 momjian Exp $ + * $Id: cdefs.h,v 1.4 1998/09/01 04:37:51 momjian Exp $ */ #ifndef _CDEFS_H_ @@ -96,8 +96,8 @@ #else #ifndef __GNUC__ #define __inline /* delete GCC keyword */ -#endif /* !__GNUC__ */ -#endif /* !__cplusplus */ +#endif /* !__GNUC__ */ +#endif /* !__cplusplus */ #else /* !(__STDC__ || __cplusplus) */ #define __P(protos) () /* traditional C preprocessor */ @@ -123,8 +123,8 @@ #define signed #define volatile #endif -#endif /* !__GNUC__ */ -#endif /* !(__STDC__ || __cplusplus) */ +#endif /* !__GNUC__ */ +#endif /* !(__STDC__ || __cplusplus) */ /* * GCC1 and some versions of GCC2 declare dead (non-returning) and @@ -148,4 +148,4 @@ #define __pure #endif -#endif /* !_CDEFS_H_ */ +#endif /* !_CDEFS_H_ */ diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index c4a306e4c23..55c11733eac 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -50,10 +50,10 @@ typedef struct { int re_magic; size_t re_nsub; /* number of parenthesized subexpressions */ - const pg_wchar *re_endp; /* end pointer for REG_PEND */ + const pg_wchar *re_endp; /* end pointer for REG_PEND */ struct re_guts *re_g; /* none of your business :-) */ #ifdef MULTIBYTE - pg_wchar *patsave; /* mee too :-) */ + pg_wchar *patsave; /* mee too :-) */ #endif } regex_t; @@ -104,9 +104,8 @@ typedef struct int pg95_regcomp(regex_t *, const char *, int); size_t pg95_regerror(int, const regex_t *, char *, size_t); -int -pg95_regexec(const regex_t *, +int pg95_regexec(const regex_t *, const char *, size_t, regmatch_t[], int); void pg95_regfree(regex_t *); -#endif /* !_REGEX_H_ */ +#endif /* !_REGEX_H_ */ diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index e17491164a0..aab9195dc55 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -129,9 +129,9 @@ typedef struct uch mask; /* bit within array */ #ifdef MULTIBYTE pg_wchar hash; /* hash code */ - unsigned int lc; /* leading character (character-set) */ + unsigned int lc; /* leading character (character-set) */ #else - uch hash; /* hash code */ + uch hash; /* hash code */ #endif size_t smultis; char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ @@ -139,11 +139,11 @@ typedef struct /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ #ifdef MULTIBYTE -#define CHlc(c) (((unsigned)(c)&0xff0000)>>16) +#define CHlc(c) (((unsigned)(c)&0xff0000)>>16) #define CHadd(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] |= (cs)->mask, (cs)->hash += (unsigned)(c)&0xffff,\ (cs)->lc = CHlc(c)) #define CHsub(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] &= ~(cs)->mask, (cs)->hash -= (unsigned)(c)&0xffff) -#define CHIN(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] & (cs)->mask && \ +#define CHIN(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] & (cs)->mask && \ ((cs)->lc == CHlc(c))) #define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal * fns */ @@ -186,7 +186,7 @@ struct re_guts int neol; /* number of $ used */ int ncategories; /* how many character categories */ cat_t *categories; /* ->catspace[-CHAR_MIN] */ - pg_wchar *must; /* match must contain this string */ + pg_wchar *must; /* match must contain this string */ int mlen; /* length of must */ size_t nsub; /* copy of re_nsub */ int backrefs; /* does it use back references? */ @@ -197,9 +197,9 @@ struct re_guts /* misc utilities */ #ifdef MULTIBYTE -# define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */ +#define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */ #else -# define OUT (CHAR_MAX+1) /* a non-character value */ +#define OUT (CHAR_MAX+1) /* a non-character value */ #endif #ifdef MULTIBYTE diff --git a/src/include/regex/regexp.h b/src/include/regex/regexp.h index d8008190708..9efa403eb94 100644 --- a/src/include/regex/regexp.h +++ b/src/include/regex/regexp.h @@ -68,4 +68,4 @@ void pg95_regerror __P((const char *)); __END_DECLS -#endif /* !_REGEXP_H_ */ +#endif /* !_REGEXP_H_ */ |