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

tglsfdc · tglsfdc · commit 06ce02f98959 · 2007-10-06T16:05:54.000Z
warnings on a 64-bit machine.  Noted while chasing a recent regex
bug report.
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.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/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, "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);
 	if (!NULLCNFA(g->search))
diff --git 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.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)
 		while (cp < realstop)
 		{
-			FDEBUG(("+++ at c%d +++\n", css - d->ssets));
+			FDEBUG(("+++ at c%d +++\n", (int) (css - d->ssets)));
 			co = GETCOLOR(cm, *cp);
 			FDEBUG(("char %c, color %ld\n", (char) *cp, (long) co));
 			ss = css->outs[co];
@@ -109,7 +109,7 @@ longest(struct vars * v,		/* used only for debug and exec flags */
 		}
 
 	/* 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 (hitstopp != NULL)
@@ -184,7 +184,7 @@ shortest(struct vars * v,
 	if (v->eflags & REG_FTRACE)
 		while (cp < realmax)
 		{
-			FDEBUG(("--- at c%d ---\n", css - d->ssets));
+			FDEBUG(("--- at c%d ---\n", (int) (css - d->ssets)));
 			co = GETCOLOR(cm, *cp);
 			FDEBUG(("char %c, color %ld\n", (char) *cp, (long) 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--)
 		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 */
 		}
 	if (i == 0)
@@ -521,7 +521,8 @@ miss(struct vars * v,			/* used only for debug flags */
 
 	if (!sawlacons)
 	{							/* 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->inchain[co] = p->ins;
 		p->ins.ss = css;
@@ -586,7 +587,7 @@ getvacant(struct vars * v,		/* used only for debug flags */
 	while ((p = ap.ss) != NULL)
 	{
 		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;
 		ap = p->inchain[co];
 		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 */
 		if (p == NULL)
 			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)
 			p->ins = ss->inchain[i];
 		else
@@ -678,15 +679,15 @@ pickss(struct vars * v,			/* used only for debug flags */
 			!(ss->flags & LOCKED))
 		{
 			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
+			FDEBUG(("replacing c%d\n", (int) (ss - d->ssets)));
 			return ss;
 		}
 	for (ss = d->ssets, end = d->search; ss < end; ss++)
 		if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
 			!(ss->flags & LOCKED))
 		{
 			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
+			FDEBUG(("replacing c%d\n", (int) (ss - d->ssets)));
 			return ss;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF`
`29`	`29`	`* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`30`	`30`	`*`
`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 $`
`32`	`32`	`*`
`33`	`33`	`*/`
`34`	`34`
`@@ -2132,7 +2132,7 @@ dump(regex_t *re,`
`2132`	`2132`
`2133`	`2133`	`fprintf(f, "\n\n\n========= DUMP ==========\n");`
`2134`	`2134`	`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);`
`2136`	`2136`
`2137`	`2137`	`dumpcolors(&g->cmap, f);`
`2138`	`2138`	`if (!NULLCNFA(g->search))`