From 196d590a99e309764e07c9dc23ea98897eebf53a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 27 Jul 2016 22:21:58 +0200
Subject: (error) va_list 'args' was opened but not closed by va_end()

Reported-By: cppcheck
Gbp-Dch: Ignore
---
 apt-pkg/contrib/error.cc | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'apt-pkg/contrib/error.cc')

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8a87e16e9..c06ea8364 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -68,13 +68,12 @@ bool GlobalError::NAME (const char *Function, const char *Description,...) { \
 	va_list args; \
 	size_t msgSize = 400; \
 	int const errsv = errno; \
-	while (true) { \
+	bool retry; \
+	do { \
 		va_start(args,Description); \
-		bool const retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \
+		retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \
 		va_end(args); \
-		if (retry == false) \
-			break; \
-	} \
+	} while (retry); \
 	return false; \
 }
 GEMessage(FatalE, FATAL)
@@ -90,13 +89,12 @@ bool GlobalError::InsertErrno(MsgType const &type, const char *Function,
 	va_list args;
 	size_t msgSize = 400;
 	int const errsv = errno;
-	while (true) {
+	bool retry;
+	do {
 		va_start(args,Description);
-		bool const retry = InsertErrno(type, Function, Description, args, errsv, msgSize);
+		retry = InsertErrno(type, Function, Description, args, errsv, msgSize);
 		va_end(args);
-		if (retry == false)
-		   break;
-	}
+	} while (retry);
 	return false;
 }
 									/*}}}*/
@@ -127,12 +125,12 @@ bool GlobalError::InsertErrno(MsgType type, const char* Function,
 bool GlobalError::NAME (const char *Description,...) { \
 	va_list args; \
 	size_t msgSize = 400; \
-	while (true) { \
+	bool retry; \
+	do { \
 		va_start(args,Description); \
-		if (Insert(TYPE, Description, args, msgSize) == false) \
-			break; \
+		retry = Insert(TYPE, Description, args, msgSize); \
 		va_end(args); \
-	} \
+	} while (retry); \
 	return false; \
 }
 GEMessage(Fatal, FATAL)
@@ -147,12 +145,12 @@ bool GlobalError::Insert(MsgType const &type, const char *Description,...)
 {
 	va_list args;
 	size_t msgSize = 400;
-	while (true) {
+	bool retry;
+	do {
 		va_start(args,Description);
-		if (Insert(type, Description, args, msgSize) == false)
-			break;
+		retry = Insert(type, Description, args, msgSize);
 		va_end(args);
-	}
+	} while (retry);
 	return false;
 }
 									/*}}}*/
-- 
cgit v1.2.3