* Swedish translation update. Closes: #592366

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

diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index fc7b38f1b92f7ca8c7296e5c3eff630fb7688503..ae756dbc49742cc349fe3183ac098eb54ba5576c 100644 (file)
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -114,6 +114,15 @@ public:                                                                    /*{{{*/
         */
        bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold;
 
         */
        bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold;
 

+       /** \brief adds an errno message with the given type
+        *
+        * \param type of the error message
+        * \param Function which failed
+        * \param Description of the error
+        */
+       bool InsertErrno(MsgType const &type, const char* Function,
+                        const char* Description,...) __like_printf(4) __cold;
+

        /** \brief add an fatal error message to the list
         *
         *  Most of the stuff we consider as "error" is also "fatal" for
        /** \brief add an fatal error message to the list
         *
         *  Most of the stuff we consider as "error" is also "fatal" for


@@ -169,6 +178,13 @@ public:                                                                    /*{{{*/
         */
        bool Debug(const char *Description,...) __like_printf(2) __cold;
 
         */
        bool Debug(const char *Description,...) __like_printf(2) __cold;
 

+       /** \brief adds an error message with the given type
+        *
+        * \param type of the error message
+        * \param Description of the error
+        */
+       bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold;
+

        /** \brief is an error in the list?
         *
         *  \return \b true if an error is included in the list, \b false otherwise
        /** \brief is an error in the list?
         *
         *  \return \b true if an error is included in the list, \b false otherwise


@@ -204,19 +220,55 @@ public:                                                                   /*{{{*/
         *  displayed or not.
         *
         *  \param[out] out output stream to write the messages in
         *  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
         *
         *  Note that all messages are discarded, also the notices
         *  displayed or not.
         *
 
        /** \brief dumps the list of messages to std::cerr
         *
         *  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) {
+               DumpErrors(std::cerr, threshold);
+       }
+
+        // mvo: we do this instead of using a default parameter in the
+        //      previous declaration to avoid a (subtle) API break for
+        //      e.g. sigc++ and mem_fun0
+       /** \brief dumps the messages of type WARNING or higher to std::cerr
+        *
+        *  Note that all messages are discarded, displayed or not.
+        *
+        */
+       void inline DumpErrors() {
+                DumpErrors(WARNING);
+       }
+
+       /** \brief put the current Messages into the stack
+        *
+        *  All "old" messages will be pushed into a stack to
+        *  them later back, but for now the Message query will be
+        *  empty and performs as no messages were present before.
+        *
+        * The stack can be as deep as you want - all stack operations
+        * will only operate on the last element in the stack.
+        */
+       void PushToStack();
+
+       /** \brief throw away all current messages */
+       void RevertToStack();
+
+       /** \brief merge current and stack together */
+       void MergeWithStack();
+
+       /** \brief return the deep of the stack */
+       size_t StackCount() const {
+               return Stacks.size();

        }
 
        GlobalError();
        }
 
        GlobalError();


@@ -244,10 +296,20 @@ private:                                                          /*{{{*/
        std::list<Item> Messages;
        bool PendingFlag;
 
        std::list<Item> Messages;
        bool PendingFlag;
 

+       struct MsgStack {
+               std::list<Item> const Messages;
+               bool const PendingFlag;
+
+               MsgStack(std::list<Item> const &Messages, bool const &Pending) :
+                        Messages(Messages), PendingFlag(Pending) {};
+       };
+
+       std::list<MsgStack> Stacks;
+

        bool InsertErrno(MsgType type, const char* Function,
        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,
        bool Insert(MsgType type, const char* Description,

-                        va_list const &args);
+                        va_list &args);

                                                                        /*}}}*/
 };
                                                                        /*}}}*/
                                                                        /*}}}*/
 };
                                                                        /*}}}*/