Tweak streamutil.c further to avoid scan-build warning

petere · petere · commit f4482a542c30 · 2013-11-21T21:46:43.000-05:00
The previous change added a new scan-build warning about need_password
assigned but not read.
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -117,7 +117,7 @@ GetConnection(void)
 	/* If -W was given, force prompt for password, but only the first time */
 	need_password = (dbgetpassword == 1 && dbpassword == NULL);
 
-	while (true)
+	do
 	{
 		/* Get a new password if appropriate */
 		if (need_password)
@@ -161,9 +161,8 @@ GetConnection(void)
 			PQfinish(tmpconn);
 			need_password = true;
 		}
-		else
-			break;
 	}
+	while (need_password);
 
 	if (PQstatus(tmpconn) != CONNECTION_OK)
 	{

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ GetConnection(void)`
`117`	`117`	`/* If -W was given, force prompt for password, but only the first time */`
`118`	`118`	`need_password = (dbgetpassword == 1 && dbpassword == NULL);`
`119`	`119`
`120`		`- while (true)`
	`120`	`+ do`
`121`	`121`	`{`
`122`	`122`	`/* Get a new password if appropriate */`
`123`	`123`	`if (need_password)`
`@@ -161,9 +161,8 @@ GetConnection(void)`
`161`	`161`	`PQfinish(tmpconn);`
`162`	`162`	`need_password = true;`
`163`	`163`	`}`
`164`		`- else`
`165`		`- break;`
`166`	`164`	`}`
	`165`	`+ while (need_password);`
`167`	`166`
`168`	`167`	`if (PQstatus(tmpconn) != CONNECTION_OK)`
`169`	`168`	`{`