diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-05 22:51:30 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-05 22:51:30 +0200 |
| commit | afc2891fdac29848826a7f9cdeb22ce0c2409350 (patch) | |
| tree | f7c5c2ea862eca5d28bbb4d45181d6f21e60d06f /apt-pkg/contrib/error.cc | |
| parent | 4ccd3b3ce69d6a6598e1773689a44fdec78a85cc (diff) | |
| parent | 64876cf7963f897efa70c3e424527e2e8651aa29 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into bugfix/coverity
Diffstat (limited to 'apt-pkg/contrib/error.cc')
| -rw-r--r-- | apt-pkg/contrib/error.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 122e2c809..d457781c3 100644 --- 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); \ - if (InsertErrno(TYPE, Function, Description, args, errsv, msgSize) == false) \ - break; \ + bool const retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \ va_end(args); \ + if (retry == false) \ + break; \ } \ 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); - if (InsertErrno(type, Function, Description, args, errsv, msgSize) == false) - break; + bool const retry = InsertErrno(type, Function, Description, args, errsv, msgSize); va_end(args); + if (retry == false) + break; } return false; } |