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

  - docstring cleanup

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index fbb6e463631e8058521aff6d81036816a736e028..d63b06d13b44285f42e17d40b21ab681101aefb0 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -180,7 +180,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();
@@ -189,7 +189,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();
 }

diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index e5517c2da784d1153877871fc6bf04b8f1a87bbc..d395004279ab9bb5f2455a5dd37896166c35959c 100644 (file)
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -204,9 +204,10 @@ public:                                                                    /*{{{*/
         *  displayed or not.
         *
         *  \param[out] out output stream to write the messages in
-        *  \param WithoutNotice output notices or not
+        *  \param threshold minimim level considered
+         *  \param mergeStack 
         */
-       void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING,
+       void DumpErrors(std::ostream &out, MsgType const &threshold = WARNING,
                        bool const &mergeStack = true);
 
        /** \brief dumps the list of messages to std::cerr
@@ -214,10 +215,10 @@ public:                                                                   /*{{{*/
         *  Note that all messages are discarded, also the notices
         *  displayed or not.
         *
-        *  \param WithoutNotice print notices or not
+        *  \param threshold minimum level printed
         */
-       void inline DumpErrors(MsgType const &trashhold = WARNING) {
-               DumpErrors(std::cerr, trashhold);
+       void inline DumpErrors(MsgType const &threshold = WARNING) {
+               DumpErrors(std::cerr, threshold);
        }
 
        /** \brief put the current Messages into the stack

diff --git a/debian/changelog b/debian/changelog
index 49f8bce4659ce03d4065fc8370b7750b6fb806ff..5457036031feef46da828ee74d59e93f6cb36e29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,10 @@ apt (0.7.26~exp11) experimental; urgency=low
     - try to install another or-group member in DepRemove before
       breaking the or group (Closes: #590438)
     - configure also the replacement before remove by adding Immediate flag
+  
+  [ Michael Vogt ]
+  * apt-pkg/contrib/error.{cc,h}
+    - docstring cleanup
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 26 Jul 2010 12:40:44 +0200