rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 14:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust some regex debugging printouts to not give wrong-format-width

Browse Source 
warnings on a 64-bit machine.  Noted while chasing a recent regex
bug report.
This commit is contained in:
Tom Lane 2007-10-06 16:05:54 +00:00
parent c4db0d9ae1
commit 06ce02f989
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/regex/regcomp.c
View File

@ -28,7 +28,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $PostgreSQL: pgsql/src/backend/regex/regcomp.c,v 1.44 2005/10/15 02:49:24 momjian Exp $ * $PostgreSQL: pgsql/src/backend/regex/regcomp.c,v 1.45 2007/10/06 16:05:54 tgl Exp $
* *
*/ */
@ -2132,7 +2132,7 @@ dump(regex_t *re,
fprintf(f, "\n\n\n========= DUMP ==========\n"); fprintf(f, "\n\n\n========= DUMP ==========\n");
fprintf(f, "nsub %d, info 0%lo, csize %d, ntree %d\n", fprintf(f, "nsub %d, info 0%lo, csize %d, ntree %d\n",
re->re_nsub, re->re_info, re->re_csize, g->ntree); (int) re->re_nsub, re->re_info, re->re_csize, g->ntree);
dumpcolors(&g->cmap, f); dumpcolors(&g->cmap, f);
if (!NULLCNFA(g->search)) if (!NULLCNFA(g->search))

21
src/backend/regex/rege_dfa.c
View File

@ -28,7 +28,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.7 2007/02/01 19:10:27 momjian Exp $ * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.8 2007/10/06 16:05:54 tgl Exp $
* *
*/ */
@ -78,7 +78,7 @@ longest(struct vars * v, /* used only for debug and exec flags */
if (v->eflags & REG_FTRACE) if (v->eflags & REG_FTRACE)
while (cp < realstop) while (cp < realstop)
{ {
FDEBUG(("+++ at c%d +++\n", css - d->ssets)); FDEBUG(("+++ at c%d +++\n", (int) (css - d->ssets)));
co = GETCOLOR(cm, *cp); co = GETCOLOR(cm, *cp);
FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co)); FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co));
ss = css->outs[co]; ss = css->outs[co];
@ -109,7 +109,7 @@ longest(struct vars * v, /* used only for debug and exec flags */
} }
/* shutdown */ /* shutdown */
FDEBUG(("+++ shutdown at c%d +++\n", css - d->ssets)); FDEBUG(("+++ shutdown at c%d +++\n", (int) (css - d->ssets)));
if (cp == v->stop && stop == v->stop) if (cp == v->stop && stop == v->stop)
{ {
if (hitstopp != NULL) if (hitstopp != NULL)
@ -184,7 +184,7 @@ shortest(struct vars * v,
if (v->eflags & REG_FTRACE) if (v->eflags & REG_FTRACE)
while (cp < realmax) while (cp < realmax)
{ {
FDEBUG(("--- at c%d ---\n", css - d->ssets)); FDEBUG(("--- at c%d ---\n", (int) (css - d->ssets)));
co = GETCOLOR(cm, *cp); co = GETCOLOR(cm, *cp);
FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co)); FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co));
ss = css->outs[co]; ss = css->outs[co];
@ -503,7 +503,7 @@ miss(struct vars * v, /* used only for debug flags */
for (p = d->ssets, i = d->nssused; i > 0; p++, i--) for (p = d->ssets, i = d->nssused; i > 0; p++, i--)
if (HIT(h, d->work, p, d->wordsper)) if (HIT(h, d->work, p, d->wordsper))
{ {
FDEBUG(("cached c%d\n", p - d->ssets)); FDEBUG(("cached c%d\n", (int) (p - d->ssets)));
break; /* NOTE BREAK OUT */ break; /* NOTE BREAK OUT */
} }
if (i == 0) if (i == 0)
@ -521,7 +521,8 @@ miss(struct vars * v, /* used only for debug flags */
if (!sawlacons) if (!sawlacons)
{ /* lookahead conds. always cache miss */ { /* lookahead conds. always cache miss */
FDEBUG(("c%d[%d]->c%d\n", css - d->ssets, co, p - d->ssets)); FDEBUG(("c%d[%d]->c%d\n",
(int) (css - d->ssets), co, (int) (p - d->ssets)));
css->outs[co] = p; css->outs[co] = p;
css->inchain[co] = p->ins; css->inchain[co] = p->ins;
p->ins.ss = css; p->ins.ss = css;
@ -586,7 +587,7 @@ getvacant(struct vars * v, /* used only for debug flags */
while ((p = ap.ss) != NULL) while ((p = ap.ss) != NULL)
{ {
co = ap.co; co = ap.co;
FDEBUG(("zapping c%d's %ld outarc\n", p - d->ssets, (long) co)); FDEBUG(("zapping c%d's %ld outarc\n", (int) (p - d->ssets), (long) co));
p->outs[co] = NULL; p->outs[co] = NULL;
ap = p->inchain[co]; ap = p->inchain[co];
p->inchain[co].ss = NULL; /* paranoia */ p->inchain[co].ss = NULL; /* paranoia */
@ -600,7 +601,7 @@ getvacant(struct vars * v, /* used only for debug flags */
assert(p != ss); /* not self-referential */ assert(p != ss); /* not self-referential */
if (p == NULL) if (p == NULL)
continue; /* NOTE CONTINUE */ continue; /* NOTE CONTINUE */
FDEBUG(("del outarc %d from c%d's in chn\n", i, p - d->ssets)); FDEBUG(("del outarc %d from c%d's in chn\n", i, (int) (p - d->ssets)));
if (p->ins.ss == ss && p->ins.co == i) if (p->ins.ss == ss && p->ins.co == i)
p->ins = ss->inchain[i]; p->ins = ss->inchain[i];
else else
@ -678,7 +679,7 @@ pickss(struct vars * v, /* used only for debug flags */
!(ss->flags & LOCKED)) !(ss->flags & LOCKED))
{ {
d->search = ss + 1; d->search = ss + 1;
FDEBUG(("replacing c%d\n", ss - d->ssets)); FDEBUG(("replacing c%d\n", (int) (ss - d->ssets)));
return ss; return ss;
} }
for (ss = d->ssets, end = d->search; ss < end; ss++) for (ss = d->ssets, end = d->search; ss < end; ss++)
@ -686,7 +687,7 @@ pickss(struct vars * v, /* used only for debug flags */
!(ss->flags & LOCKED)) !(ss->flags & LOCKED))
{ {
d->search = ss + 1; d->search = ss + 1;
FDEBUG(("replacing c%d\n", ss - d->ssets)); FDEBUG(("replacing c%d\n", (int) (ss - d->ssets)));
return ss; return ss;
} }