Suppress a few 'uninitialized variable' warnings that gcc emits only at

tglsfdc · tglsfdc · commit a46ca619f858 · 2006-11-11T01:14:19.000Z
-O3 or higher (presumably because it inlines more things).  Per gripe
from Mark Mielke.
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.145 2006/11/01 19:43:17 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.146 2006/11/11 01:14:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1082,6 +1082,9 @@ _bt_findsplitloc(Relation rel,
 												 BTREE_DEFAULT_FILLFACTOR);
 	else
 		state.fillfactor = BTREE_NONLEAF_FILLFACTOR;
+	state.newitemonleft = false;	/* these just to keep compiler quiet */
+	state.firstright = 0;
+	state.best_delta = 0;
 
 	/* Total free space available on a btree page, after fixed overhead */
 	leftspace = rightspace =
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
@@ -54,7 +54,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.168 2006/11/10 01:21:41 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.169 2006/11/11 01:14:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -626,7 +626,10 @@ cost_bitmap_tree_node(Path *path, Cost *cost, Selectivity *selec)
 		*selec = ((BitmapOrPath *) path)->bitmapselectivity;
 	}
 	else
+	{
 		elog(ERROR, "unrecognized node type: %d", nodeTag(path));
+		*cost = *selec = 0;		/* keep compiler quiet */
+	}
 }
 
 /*
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.168 2006/10/04 00:29:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.169 2006/11/11 01:14:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1257,7 +1257,10 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
 
 	/* Julian day routines are not correct for negative Julian days */
 	if (!IS_VALID_JULIAN(tm->tm_year, tm->tm_mon, tm->tm_mday))
+	{
+		*result = 0;			/* keep compiler quiet */
 		return -1;
+	}
 
 	date = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - POSTGRES_EPOCH_JDATE;
 	time = time2t(tm->tm_hour, tm->tm_min, tm->tm_sec, fsec);
@@ -1266,11 +1269,17 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
 	*result = date * USECS_PER_DAY + time;
 	/* check for major overflow */
 	if ((*result - time) / USECS_PER_DAY != date)
+	{
+		*result = 0;			/* keep compiler quiet */
 		return -1;
+	}
 	/* check for just-barely overflow (okay except time-of-day wraps) */
 	if ((*result < 0 && date >= 0) ||
 		(*result >= 0 && date < 0))
+	{
+		*result = 0;			/* keep compiler quiet */
 		return -1;
+	}
 #else
 	*result = date * SECS_PER_DAY + time;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.145 2006/11/01 19:43:17 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.146 2006/11/11 01:14:18 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1082,6 +1082,9 @@ _bt_findsplitloc(Relation rel,`
`1082`	`1082`	`BTREE_DEFAULT_FILLFACTOR);`
`1083`	`1083`	`else`
`1084`	`1084`	`state.fillfactor = BTREE_NONLEAF_FILLFACTOR;`
	`1085`	`+ state.newitemonleft = false; /* these just to keep compiler quiet */`
	`1086`	`+ state.firstright = 0;`
	`1087`	`+ state.best_delta = 0;`
`1085`	`1088`
`1086`	`1089`	`/* Total free space available on a btree page, after fixed overhead */`
`1087`	`1090`	`leftspace = rightspace =`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`* Portions Copyright (c) 1994, Regents of the University of California`
`55`	`55`	`*`
`56`	`56`	`* IDENTIFICATION`
`57`		`- * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.168 2006/11/10 01:21:41 tgl Exp $`
	`57`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.169 2006/11/11 01:14:19 tgl Exp $`
`58`	`58`	`*`
`59`	`59`	`*-------------------------------------------------------------------------`
`60`	`60`	`*/`
`@@ -626,7 +626,10 @@ cost_bitmap_tree_node(Path path, Cost cost, Selectivity *selec)`
`626`	`626`	`selec = ((BitmapOrPath ) path)->bitmapselectivity;`
`627`	`627`	`}`
`628`	`628`	`else`
	`629`	`+ {`
`629`	`630`	`elog(ERROR, "unrecognized node type: %d", nodeTag(path));`
	`631`	`+ cost = selec = 0; /* keep compiler quiet */`
	`632`	`+ }`
`630`	`633`	`}`
`631`	`634`
`632`	`635`	`/*`