proper cleanup varargs in _error (uncovered by Coverity)

Git-Dch: Ignore

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 122e2c8098eb6b063b87bdbcc0ef576b3bbc2c8c..d457781c3e70e16c60c7c50b83a45c6bb5b48680 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -67,9 +67,10 @@ bool GlobalError::NAME (const char *Function, const char *Description,...) { \
        int const errsv = errno; \
        while (true) { \
                va_start(args,Description); \
        int const errsv = errno; \
        while (true) { \
                va_start(args,Description); \

-               if (InsertErrno(TYPE, Function, Description, args, errsv, msgSize) == false) \
-                       break; \
+               bool const retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \

                va_end(args); \
                va_end(args); \

+               if (retry == false) \
+                       break; \

        } \
        return false; \
 }
        } \
        return false; \
 }


@@ -88,9 +89,10 @@ bool GlobalError::InsertErrno(MsgType const &type, const char *Function,
        int const errsv = errno;
        while (true) {
                va_start(args,Description);
        int const errsv = errno;
        while (true) {
                va_start(args,Description);

-               if (InsertErrno(type, Function, Description, args, errsv, msgSize) == false)
-                       break;
+               bool const retry = InsertErrno(type, Function, Description, args, errsv, msgSize);

                va_end(args);
                va_end(args);

+               if (retry == false)
+                  break;

        }
        return false;
 }
        }
        return false;
 }