8000 Adjust some regex debugging printouts to not give wrong-format-width · postgrespro/postgres_cluster@06ce02f · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 06ce02f

Browse files
tglsfdctglsfdc
committed
Adjust some regex debugging printouts to not give wrong-format-width
warnings on a 64-bit machine. Noted while chasing a recent regex bug report.
1 parent c4db0d9 commit 06ce02f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

‎src/backend/regex/regcomp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2929
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*
31-
* $PostgreSQL: pgsql/src/backend/regex/regcomp.c,v 1.44 2005/10/15 02:49:24 momjian Exp $
31+
* $PostgreSQL: pgsql/src/backend/regex/regcomp.c,v 1.45 2007/10/06 16:05:54 tgl Exp $
3232
*
3333
*/
3434

@@ -2132,7 +2132,7 @@ dump(regex_t *re,
21322132

21332133
fprintf(f, "\n\n\n========= DUMP ==========\n");
21342134
fprintf(f, "nsub %d, info 0%lo, csize %d, ntree %d\n",
2135-
re->re_nsub, re->re_info, re->re_csize, g->ntree);
2135+
(int) re->re_nsub, re->re_info, re->re_csize, g->ntree);
21362136

21372137
dumpcolors(&g->cmap, f);
21382138
if (!NULLCNFA(g->search))

‎src/backend/regex/rege_dfa.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2929
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*
31-
* $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.7 2007/02/01 19:10:27 momjian Exp $
31+
* $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.8 2007/10/06 16:05:54 tgl Exp $
3232
*
3333
*/
3434

@@ -78,7 +78,7 @@ longest(struct vars * v, /* used only for debug and exec flags */
7878
if (v->eflags & REG_FTRACE)
7979
while (cp < realstop)
8080
{
81-
FDEBUG(("+++ at c%d +++\n", css - d->ssets));
81+
FDEBUG(("+++ at c%d +++\n", (int) (css - d->ssets)));
8282
co = GETCOLOR(cm, *cp);
8383
FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co));
8484
ss = css->outs[co];
@@ -109,7 +109,7 @@ longest(struct vars * v, /* used only for debug and exec flags */
109109
}
110110

111111
/* shutdown */
112-
FDEBUG(("+++ shutdown at c%d +++\n", css - d->ssets));
112+
FDEBUG(("+++ shutdown at c%d +++\n", (int) (css - d->ssets)));
113113
if (cp == v->stop && stop == v->stop)
114114
{
115115
if (hitstopp != NULL)
@@ -184,7 +184,7 @@ shortest(struct vars * v,
184184
if (v->eflags & REG_FTRACE)
185185
while (cp < realmax)
186186
{
187-
FDEBUG(("--- at c%d ---\n", css - d->ssets));
187+
FDEBUG(("--- at c%d ---\n", (int) (css - d->ssets)));
188188
co = GETCOLOR(cm, *cp);
189189
FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co));
190190
ss = css->outs[co];
@@ -503,7 +503,7 @@ miss(struct vars * v, /* used only for debug flags */
503503
for (p = d->ssets, i = d->nssused; i > 0; p++, i--)
504504
if (HIT(h, d->work, p, d->wordsper))
505505
{
506-
FDEBUG(("cached c%d\n", p - d->ssets));
506+
FDEBUG(("cached c%d\n", (int) (p - d->ssets)));
507507
break; /* NOTE BREAK OUT */
508508
}
509509
if (i == 0)
@@ -521,7 +521,8 @@ miss(struct vars * v, /* used only for debug flags */
521521

522522
if (!sawlacons)
523523
{ /* lookahead conds. always cache miss */
524-
FDEBUG(("c%d[%d]->c%d\n", css - d->ssets, co, p - d->ssets));
524+
FDEBUG(("c%d[%d]->c%d\n",
525+
(int) (css - d->ssets), co, (int) (p - d->ssets)));
525526
css->outs[co] = p;
526527
css->inchain[co] = p->ins;
527528
p->ins.ss = css;
@@ -586,7 +587,7 @@ getvacant(struct vars * v, /* used only for debug flags */
586587
while ((p = ap.ss) != NULL)
587588
{
588589
co = ap.co;
589-
FDEBUG(("zapping c%d's %ld outarc\n", p - d->ssets, (long) co));
590+
FDEBUG(("zapping c%d's %ld outarc\n", (int) (p - d->ssets), (long) co));
590591
p->outs[co] = NULL;
591592
ap = p->inchain[co];
592593
p->inchain[co].ss = NULL; /* paranoia */
@@ -600,7 +601,7 @@ getvacant(struct vars * v, /* used only for debug flags */
600601
assert(p != ss); /* not self-referential */
601602
if (p == NULL)
602603
continue; /* NOTE CONTINUE */
603-
FDEBUG(("del outarc %d from c%d's in chn\n", i, p - d->ssets));
604+
FDEBUG(("del outarc %d from c%d's in chn\n", i, (int) (p - d->ssets)));
604605
if (p->ins.ss == ss && p->ins.co == i)
605606
p->ins = ss->inchain[i];
606607
else
@@ -678,15 +679,15 @@ pickss(struct vars * v, /* used only for debug flags */
678679
!(ss->flags & LOCKED))
679680
{
680681
d->search = ss + 1;
681-
FDEBUG(("replacing c%d\n", ss - d->ssets));
682+
FDEBUG(("replacing c%d\n", (int) (ss - d-> 6D47 ssets)));
682683
return ss;
683684
}
684685
for (ss = d->ssets, end = d->search; ss < end; ss++)
685686
if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
686687
!(ss->flags & LOCKED))
687688
{
688689
d->search = ss + 1;
689-
FDEBUG(("replacing c%d\n", ss - d->ssets));
690+
FDEBUG(("replacing c%d\n", (int) (ss - d->ssets)));
690691
return ss;
691692
}
692693

0 commit comments

Comments
 (0)
0