Fix possibly-uninitialized-variable warning from commit 9556aa0.

tglsfdc · tglsfdc · commit 6119060d01ab · 2019-01-25T11:27:44.000-05:00
Heikki's compiler doesn't complain about end_ptr, apparently,
but mine does.

In passing, I failed to resist the temptation to remove the
no-longer-used fldnum variable, and relocate chunk_len's
declaration to a narrower scope.
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -4613,8 +4613,6 @@ text_to_array_internal(PG_FUNCTION_ARGS)
 		 * to search for occurrences of fldsep.
 		 */
 		TextPositionState state;
-		int			fldnum;
-		int			chunk_len;
 
 		inputstring_len = VARSIZE_ANY_EXHDR(inputstring);
 		fldsep_len = VARSIZE_ANY_EXHDR(fldsep);
@@ -4651,10 +4649,11 @@ text_to_array_internal(PG_FUNCTION_ARGS)
 
 		start_ptr = VARDATA_ANY(inputstring);
 
-		for (fldnum = 1;; fldnum++) /* field number is 1 based */
+		for (;;)
 		{
 			bool		found;
 			char	   *end_ptr;
+			int			chunk_len;
 
 			CHECK_FOR_INTERRUPTS();
 
@@ -4663,6 +4662,7 @@ text_to_array_internal(PG_FUNCTION_ARGS)
 			{
 				/* fetch last field */
 				chunk_len = ((char *) inputstring + VARSIZE_ANY(inputstring)) - start_ptr;
+				end_ptr = NULL; /* not used, but some compilers complain */
 			}
 			else
 			{

Original file line number	Diff line number	Diff line change
`@@ -4613,8 +4613,6 @@ text_to_array_internal(PG_FUNCTION_ARGS)`
`4613`	`4613`	`* to search for occurrences of fldsep.`
`4614`	`4614`	`*/`
`4615`	`4615`	`TextPositionState state;`
`4616`		`- int fldnum;`
`4617`		`- int chunk_len;`
`4618`	`4616`
`4619`	`4617`	`inputstring_len = VARSIZE_ANY_EXHDR(inputstring);`
`4620`	`4618`	`fldsep_len = VARSIZE_ANY_EXHDR(fldsep);`
`@@ -4651,10 +4649,11 @@ text_to_array_internal(PG_FUNCTION_ARGS)`
`4651`	`4649`
`4652`	`4650`	`start_ptr = VARDATA_ANY(inputstring);`
`4653`	`4651`
`4654`		`- for (fldnum = 1;; fldnum++) /* field number is 1 based */`
	`4652`	`+ for (;;)`
`4655`	`4653`	`{`
`4656`	`4654`	`bool found;`
`4657`	`4655`	`char *end_ptr;`
	`4656`	`+ int chunk_len;`
`4658`	`4657`
`4659`	`4658`	`CHECK_FOR_INTERRUPTS();`
`4660`	`4659`
`@@ -4663,6 +4662,7 @@ text_to_array_internal(PG_FUNCTION_ARGS)`
`4663`	`4662`	`{`
`4664`	`4663`	`/* fetch last field */`
`4665`	`4664`	`chunk_len = ((char *) inputstring + VARSIZE_ANY(inputstring)) - start_ptr;`
	`4665`	`+ end_ptr = NULL; /* not used, but some compilers complain */`
`4666`	`4666`	`}`
`4667`	`4667`	`else`
`4668`	`4668`	`{`