Suppress some 'variable may be used uninitialized' warnings from gcc 4.4.

tglsfdc · tglsfdc · commit 9563afafeb45 · 2009-04-23T23:25:13.000Z
diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.44 2009/01/23 19:58:06 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.45 2009/04/23 23:25:13 tgl Exp $
  *
  * This file and the IPV6 implementation were initially provided by
  * Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design
@@ -394,6 +394,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
 
 				if (bits < 0 || bits > 32)
 					return -1;
+				memset(&mask4, 0, sizeof(mask4));
 				/* avoid "x << 32", which is not portable */
 				if (bits > 0)
 					maskl = (0xffffffffUL << (32 - (int) bits))
@@ -413,6 +414,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
 
 				if (bits < 0 || bits > 128)
 					return -1;
+				memset(&mask6, 0, sizeof(mask6));
 				for (i = 0; i < 16; i++)
 				{
 					if (bits <= 0)

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/libpq/ip.c,v 1.44 2009/01/23 19:58:06 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.45 2009/04/23 23:25:13 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* This file and the IPV6 implementation were initially provided by`
`14`	`14`	`* Nigel Kukard <nkukard@lbsd.net>, Linux Based Systems Design`
`@@ -394,6 +394,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)`
`394`	`394`
`395`	`395`	`if (bits < 0 \|\| bits > 32)`
`396`	`396`	`return -1;`
	`397`	`+ memset(&mask4, 0, sizeof(mask4));`
`397`	`398`	`/* avoid "x << 32", which is not portable */`
`398`	`399`	`if (bits > 0)`
`399`	`400`	`maskl = (0xffffffffUL << (32 - (int) bits))`
`@@ -413,6 +414,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)`
`413`	`414`
`414`	`415`	`if (bits < 0 \|\| bits > 128)`
`415`	`416`	`return -1;`
	`417`	`+ memset(&mask6, 0, sizeof(mask6));`
`416`	`418`	`for (i = 0; i < 16; i++)`
`417`	`419`	`{`
`418`	`420`	`if (bits <= 0)`