Clean up possibly-uninitialized-variable warnings reported by gcc 4.x.

tglsfdc · tglsfdc · commit 0df7f493f8ab · 2005-09-24T23:07:18.000Z
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
@@ -58,6 +58,8 @@ gettoken(WORKSTATE * state, int4 *val)
 	char		nnn[16],
 			   *curnnn;
 
+	*val = 0;					/* default result */
+
 	curnnn = nnn;
 	while (1)
 	{
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
@@ -197,13 +197,13 @@ pushval_asis(QPRS_STATE * state, int type, char *strval, int lenval, uint16 flag
 static int4
 makepol(QPRS_STATE * state)
 {
-	int4		val,
+	int4		val = 0,
 				type;
-	int4		lenval;
-	char	   *strval;
+	int4		lenval = 0;
+	char	   *strval = NULL;
 	int4		stack[STACKDEPTH];
 	int4		lenstack = 0;
-	uint16		flag;
+	uint16		flag = 0;
 
 	while ((type = gettoken_query(state, &val, &lenval, &strval, &flag)) != END)
 	{
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
@@ -317,13 +317,13 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval, int2 we
 static int4
 makepol(QPRS_STATE * state, void (*pushval) (QPRS_STATE *, int, char *, int, int2))
 {
-	int4		val,
+	int4		val = 0,
 				type;
-	int4		lenval;
-	char	   *strval;
+	int4		lenval = 0;
+	char	   *strval = NULL;
 	int4		stack[STACKDEPTH];
 	int4		lenstack = 0;
-	int2		weight;
+	int2		weight = 0;
 
 	while ((type = gettoken_query(state, &val, &lenval, &strval, &weight)) != END)
 	{

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ gettoken(WORKSTATE * state, int4 *val)`
`58`	`58`	`char nnn[16],`
`59`	`59`	`*curnnn;`
`60`	`60`
	`61`	`+ val = 0; / default result */`
	`62`	`+`
`61`	`63`	`curnnn = nnn;`
`62`	`64`	`while (1)`
`63`	`65`	`{`