warning: cast from type A to type B casts away qualifiers [-Wcast-qual]

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 1b636e4d5fe6c6851a7cc5f718cdb07e455bc30f..bf5b8c1feacdbf233dfd556ebd5b43056e6e2172 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -7,6 +7,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>


@@ -17,34 +19,32 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>

-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/upgrade.h>

 
 #include <unistd.h>
 #include <cstdio>
 
 #include <unistd.h>
 #include <cstdio>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool ShowHelp(CommandLine &CmdL) {
                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool ShowHelp(CommandLine &CmdL) {

-       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+       ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<
                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<

-               _("Usage: apt-internal-resolver\n"
+               _("Usage: apt-internal-solver\n"

                "\n"
                "\n"

-               "apt-internal-resolver is an interface to use the current internal\n"
+               "apt-internal-solver is an interface to use the current internal\n"

                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"
                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"

-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-               "apt.conf(5) manual pages for more information and options.\n"
-               "                       This APT has Super Cow Powers.\n");
+               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");

        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/


@@ -160,16 +160,16 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        if (upgrade == true) {
                if (pkgAllUpgrade(CacheFile) == false) {
 
        if (upgrade == true) {
                if (pkgAllUpgrade(CacheFile) == false) {

-                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output);

                        return 0;
                }
        } else if (distUpgrade == true) {
                if (pkgDistUpgrade(CacheFile) == false) {
                        return 0;
                }
        } else if (distUpgrade == true) {
                if (pkgDistUpgrade(CacheFile) == false) {

-                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output);

                        return 0;
                }
        } else if (Fix.Resolve() == false) {
                        return 0;
                }
        } else if (Fix.Resolve() == false) {

-               EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
+               EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output);

                return 0;
        }
 
                return 0;
        }