diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/regex | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/regex')
| -rw-r--r-- | winsup/cygwin/regex/engine.c | 4 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/winsup/cygwin/regex/engine.c b/winsup/cygwin/regex/engine.c index 4afaf8d9a..94e418505 100644 --- a/winsup/cygwin/regex/engine.c +++ b/winsup/cygwin/regex/engine.c @@ -160,7 +160,7 @@ matcher(struct re_guts *g, int i; struct match mv; struct match *m = &mv; - const char *dp; + const char *dp = NULL; const sopno gf = g->firststate+1; /* +1 for OEND */ const sopno gl = g->laststate; const char *start; @@ -391,7 +391,7 @@ dissect(struct match *m, const char *ssp; /* start of string matched by subsubRE */ const char *sep; /* end of string matched by subsubRE */ const char *oldssp; /* previous ssp */ - const char *dp; + const char *dp __attribute__ ((unused)); AT("diss", start, stop, startst, stopst); sp = start; diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index b44ba2c62..881c16099 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -63,8 +63,6 @@ __FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delp #include "cname.h" #ifdef __CYGWIN__ -/* Don't pull in windows headers just for LCID. */ -typedef unsigned long LCID; /* These are defined in nlsfuncs.cc. */ extern LCID collate_lcid; extern char collate_charset[]; @@ -1477,8 +1475,8 @@ static void findmust(struct parse *p, struct re_guts *g) { sop *scan; - sop *start; - sop *newstart; + sop *start = NULL; + sop *newstart = NULL; sopno newlen; sop s; char *cp; |