convert EDSP to be based on FileFd instead of FILE*

[apt.git] / apt-pkg / edsp.h

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 2053e14e10478a335bc7e1d7e95fe8635275f052..433600bcdab5e7ca655ed7100b55d981c1c01189 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -45,11 +45,16 @@ namespace EDSP                                                              /*{{{*/
         *
         *  \return true if request was composed successfully, otherwise false
         */
         *
         *  \return true if request was composed successfully, otherwise false
         */

-       bool WriteRequest(pkgDepCache &Cache, FILE* output,
+       bool WriteRequest(pkgDepCache &Cache, FileFd &output,

                                 bool const upgrade = false,
                                 bool const distUpgrade = false,
                                 bool const autoRemove = false,
                                OpProgress *Progress = NULL);
                                 bool const upgrade = false,
                                 bool const distUpgrade = false,
                                 bool const autoRemove = false,
                                OpProgress *Progress = NULL);

+       bool WriteRequest(pkgDepCache &Cache, FILE* output,
+                                bool const upgrade = false,
+                                bool const distUpgrade = false,
+                                bool const autoRemove = false,
+                               OpProgress *Progress = NULL) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
        /** \brief creates the scenario representing the package universe
         *
 
        /** \brief creates the scenario representing the package universe
         *


@@ -68,7 +73,8 @@ namespace EDSP                                                                /*{{{*/
         *
         *  \return true if universe was composed successfully, otherwise false
         */
         *
         *  \return true if universe was composed successfully, otherwise false
         */

-       bool WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);
+       bool WriteScenario(pkgDepCache &Cache, FileFd &output, OpProgress *Progress = NULL);
+       bool WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
        /** \brief creates a limited scenario representing the package universe
         *
 
        /** \brief creates a limited scenario representing the package universe
         *


@@ -85,9 +91,12 @@ namespace EDSP                                                               /*{{{*/
         *
         *  \return true if universe was composed successfully, otherwise false
         */
         *
         *  \return true if universe was composed successfully, otherwise false
         */

-       bool WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+       bool WriteLimitedScenario(pkgDepCache &Cache, FileFd &output,

                                         APT::PackageSet const &pkgset,
                                         OpProgress *Progress = NULL);
                                         APT::PackageSet const &pkgset,
                                         OpProgress *Progress = NULL);

+       bool WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+                                        APT::PackageSet const &pkgset,
+                                        OpProgress *Progress = NULL) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
        /** \brief waits and acts on the information returned from the solver
         *
 
        /** \brief waits and acts on the information returned from the solver
         *


@@ -152,7 +161,8 @@ namespace EDSP                                                              /*{{{*/
         *
         *  \return true if solution could be written, otherwise false
         */
         *
         *  \return true if solution could be written, otherwise false
         */

-       bool WriteSolution(pkgDepCache &Cache, FILE* output);
+       bool WriteSolution(pkgDepCache &Cache, FileFd &output);
+       bool WriteSolution(pkgDepCache &Cache, FILE* output) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
        /** \brief sends a progress report
         *
 
        /** \brief sends a progress report
         *


@@ -160,7 +170,8 @@ namespace EDSP                                                              /*{{{*/
         *  \param message the solver wants the user to see
         *  \param output the front-end listens for progress report
         */
         *  \param message the solver wants the user to see
         *  \param output the front-end listens for progress report
         */

-       bool WriteProgress(unsigned short const percent, const char* const message, FILE* output);
+       bool WriteProgress(unsigned short const percent, const char* const message, FileFd &output);
+       bool WriteProgress(unsigned short const percent, const char* const message, FILE* output) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
        /** \brief sends an error report
         *
 
        /** \brief sends an error report
         *


@@ -177,7 +188,8 @@ namespace EDSP                                                              /*{{{*/
         *  \param message is free form text to describe the error
         *  \param output the front-end listens for error messages
         */
         *  \param message is free form text to describe the error
         *  \param output the front-end listens for error messages
         */

-       bool WriteError(char const * const uuid, std::string const &message, FILE* output);
+       bool WriteError(char const * const uuid, std::string const &message, FileFd &output);
+       bool WriteError(char const * const uuid, std::string const &message, FILE* output) APT_DEPRECATED_MSG("Use FileFd-based interface instead");

 
 
        /** \brief executes the given solver and returns the pipe ends
 
 
        /** \brief executes the given solver and returns the pipe ends