From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 24 Jan 2012 18:40:26 +0000 (-0500)
Subject: Suppress possibly-uninitialized-variable warning seen with older gcc versions.
X-Git-Tag: REL9_2_BETA1~554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beef89567e3a0e3e1c753754a474065c5ad632fe;p=postgresql

Suppress possibly-uninitialized-variable warning seen with older gcc versions.
---

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 3ab8dfe065..e5bafd3c2d 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -2490,7 +2490,7 @@ pgstat_report_activity(BackendState state, const char *cmd_str)
 	volatile PgBackendStatus *beentry = MyBEEntry;
 	TimestampTz start_timestamp;
 	TimestampTz current_timestamp;
-	int			len;
+	int			len = 0;
 
 	TRACE_POSTGRESQL_STATEMENT_STATUS(cmd_str);
 
@@ -2524,8 +2524,8 @@ pgstat_report_activity(BackendState state, const char *cmd_str)
 	start_timestamp = GetCurrentStatementStartTimestamp();
 	if (cmd_str != NULL)
 	{
-		len = strlen(cmd_str);
-		len = pg_mbcliplen(cmd_str, len, pgstat_track_activity_query_size - 1);
+		len = pg_mbcliplen(cmd_str, strlen(cmd_str),
+						   pgstat_track_activity_query_size - 1);
 	}
 
 	/*