From 6119060d01ab2dfb9e2c1c101595f2de7890965d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 25 Jan 2019 11:27:44 -0500 Subject: [PATCH] Fix possibly-uninitialized-variable warning from commit 9556aa01c. 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. --- src/backend/utils/adt/varlena.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index f23da4fa1aa..693ccc5149a 100644 --- 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 { -- 2.39.5