diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-09-24 22:54:44 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-09-24 22:54:44 +0000 |
| commit | 303e089df56251ad09e65f92df000e4ace6d82c1 (patch) | |
| tree | 09a4bee24294652a8bdf35ba4ad62f17593ebb85 /src/backend/regex | |
| parent | 5d9c6b18d30daa35e59c89f33c685e0133da0bf4 (diff) | |
| download | postgresql-303e089df56251ad09e65f92df000e4ace6d82c1.tar.gz postgresql-303e089df56251ad09e65f92df000e4ace6d82c1.zip | |
Clean up possibly-uninitialized-variable warnings reported by gcc 4.x.
Diffstat (limited to 'src/backend/regex')
| -rw-r--r-- | src/backend/regex/rege_dfa.c | 5 | ||||
| -rw-r--r-- | src/backend/regex/regexec.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c index 85041dbcd75..c612761d873 100644 --- a/src/backend/regex/rege_dfa.c +++ b/src/backend/regex/rege_dfa.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.4 2003/11/29 19:51:55 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.5 2005/09/24 22:54:38 tgl Exp $ * */ @@ -578,7 +578,6 @@ getvacant(struct vars * v, /* used only for debug flags */ struct sset *ss; struct sset *p; struct arcp ap; - struct arcp lastap; color co; ss = pickss(v, d, cp, start); @@ -608,6 +607,8 @@ getvacant(struct vars * v, /* used only for debug flags */ p->ins = ss->inchain[i]; else { + struct arcp lastap = {NULL, 0}; + assert(p->ins.ss != NULL); for (ap = p->ins; ap.ss != NULL && !(ap.ss == ss && ap.co == i); diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index e3bc41fa5e0..7d32c268982 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.25 2005/07/10 04:54:30 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.26 2005/09/24 22:54:38 tgl Exp $ * */ @@ -464,6 +464,7 @@ cfindloop(struct vars * v, if (er != REG_NOMATCH) { ERR(er); + *coldp = cold; return er; } if ((shorter) ? end == estop : end == begin) |