Bill is consistent. Bill is correct. Be like Bill.

[apt.git] / apt-pkg / contrib / error.cc

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8a87e16e9e1fbdb404bfb289f936152fbaad2f07..7d397d2c696b8de2610fccc5f1dc335fdfcdb527 100644 (file)
--- 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;
 }
                                                                        /*}}}*/
@@ -229,6 +227,15 @@ void GlobalError::Discard() {
        PendingFlag = false;
 }
                                                                        /*}}}*/
+// GlobalError::ReturnError - convert a stored error to a return code          /*{{{*/
+bool GlobalError::ReturnError() {
+       for (auto &message : Messages)
+               if (message.Type == ERROR)
+                       message.Type = WARNING;
+       PendingFlag = false;
+       return false;
+}
+                                                                       /*}}}*/
 // GlobalError::empty - does our error list include anything?          /*{{{*/
 bool GlobalError::empty(MsgType const &threshold) const {
        if (PendingFlag == true)