Browse Source

* apt-pkg/contrib/error.{cc,h}:

- remove constness of va_list parameter to fix build on amd64 and co
    Thanks Eric Valette! (Closes: #588610)
tags/debian/0.8.0
David Kalnischkies 11 years ago
parent
commit
3c0929ecbe
3 changed files with 15 additions and 7 deletions
  1. +4
    -5
      apt-pkg/contrib/error.cc
  2. +2
    -2
      apt-pkg/contrib/error.h
  3. +9
    -0
      debian/changelog

+ 4
- 5
apt-pkg/contrib/error.cc View File

@@ -94,11 +94,10 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) {
/*}}}*/
// GlobalError::InsertErrno - formats an error message with the errno /*{{{*/
bool GlobalError::InsertErrno(MsgType type, const char* Function,
const char* Description, va_list const &args) {
const char* Description, va_list &args) {
char S[400];
vsnprintf(S,sizeof(S),Description,args);
snprintf(S + strlen(S),sizeof(S) - strlen(S),
" - %s (%i: %s)", Function, errno, strerror(errno));
snprintf(S, sizeof(S), "%s - %s (%i: %s)", Description,
Function, errno, strerror(errno));
return Insert(type, S, args);
}
/*}}}*/
@@ -141,7 +140,7 @@ bool GlobalError::Debug(const char *Description,...)
/*}}}*/
// GlobalError::Insert - Insert a new item at the end /*{{{*/
bool GlobalError::Insert(MsgType type, const char* Description,
va_list const &args) {
va_list &args) {
char S[400];
vsnprintf(S,sizeof(S),Description,args);



+ 2
- 2
apt-pkg/contrib/error.h View File

@@ -278,9 +278,9 @@ private: /*{{{*/
std::list<MsgStack> Stacks;

bool InsertErrno(MsgType type, const char* Function,
const char* Description, va_list const &args);
const char* Description, va_list &args);
bool Insert(MsgType type, const char* Description,
va_list const &args);
va_list &args);
/*}}}*/
};
/*}}}*/


+ 9
- 0
debian/changelog View File

@@ -1,3 +1,12 @@
apt (0.7.26~exp10) UNRELEASED; urgency=low

[ David Kalnischkies ]
* apt-pkg/contrib/error.{cc,h}:
- remove constness of va_list parameter to fix build on amd64 and co
Thanks Eric Valette! (Closes: #588610)

-- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Jul 2010 13:44:32 +0200

apt (0.7.26~exp9) experimental; urgency=low

[ David Kalnischkies ]


Loading…
Cancel
Save