X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7ea4af9da25a802516461434b12a61e21743f960..dc67d95fa4cb0141235bf5b4195ffd39e4c96bf4:/apt-pkg/contrib/error.cc

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8cee21c9c..e2e8d6e57 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -92,13 +92,20 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) {
 	return InsertErrno(DEBUG, Function, Description, args);
 }
 									/*}}}*/
+// GlobalError::InsertErrno - Get part of the errortype string from errno/*{{{*/
+bool GlobalError::InsertErrno(MsgType const &type, const char *Function,
+				const char *Description,...) {
+	va_list args;
+	va_start(args,Description);
+	return InsertErrno(type, Function, Description, args);
+}
+									/*}}}*/
 // 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);
 }
 									/*}}}*/
@@ -139,9 +146,17 @@ bool GlobalError::Debug(const char *Description,...)
 	return Insert(DEBUG, Description, args);
 }
 									/*}}}*/
+// GlobalError::Insert - Add a errotype message to the list		/*{{{*/
+bool GlobalError::Insert(MsgType const &type, const char *Description,...)
+{
+	va_list args;
+	va_start(args,Description);
+	return Insert(type, Description, args);
+}
+									/*}}}*/
 // 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);
 
@@ -181,7 +196,7 @@ bool GlobalError::PopMessage(std::string &Text) {
 }
 									/*}}}*/
 // GlobalError::DumpErrors - Dump all of the errors/warns to cerr	/*{{{*/
-void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold,
+void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold,
 			     bool const &mergeStack) {
 	if (mergeStack == true)
 		for (std::list<MsgStack>::const_reverse_iterator s = Stacks.rbegin();
@@ -190,7 +205,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold,
 
 	for (std::list<Item>::const_iterator m = Messages.begin();
 	     m != Messages.end(); m++)
-		if (m->Type >= trashhold)
+		if (m->Type >= threshold)
 			out << (*m) << std::endl;
 	Discard();
 }