drop some needlessly public declarations in libapt-private

Git-Dch: Ignore

diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 4cbc4efa14a1b87361fde555f649707bf197593e..0f7430fa044b701c1ad26f0a6b1f42e6fc8e3dc6 100644 (file)
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -15,7 +15,7 @@
 
 class OpProgress;
 
 
 class OpProgress;
 

-struct APT_PUBLIC VersionSortDescriptionLocality                       /*{{{*/
+struct VersionSortDescriptionLocality                                  /*{{{*/

 {
    bool operator () (const pkgCache::VerIterator &v_lhs,
         const pkgCache::VerIterator &v_rhs)
 {
    bool operator () (const pkgCache::VerIterator &v_lhs,
         const pkgCache::VerIterator &v_rhs)


@@ -65,7 +65,7 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
 
 
 // CacheSetHelper saving virtual packages                              /*{{{*/
 
 
 // CacheSetHelper saving virtual packages                              /*{{{*/

-class APT_PUBLIC CacheSetHelperVirtuals: public APT::CacheSetHelper {
+class CacheSetHelperVirtuals: public APT::CacheSetHelper {

 public:
    APT::PackageSet virtualPkgs;
 
 public:
    APT::PackageSet virtualPkgs;
 


@@ -78,7 +78,7 @@ public:
                                                                        /*}}}*/
 
 // CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/
                                                                        /*}}}*/
 
 // CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/

-class APT_PUBLIC CacheSetHelperAPTGet : public APT::CacheSetHelper {
+class CacheSetHelperAPTGet : public APT::CacheSetHelper {

        /** \brief stream message should be printed to */
        std::ostream &out;
        /** \brief were things like Task or RegEx used to select packages? */
        /** \brief stream message should be printed to */
        std::ostream &out;
        /** \brief were things like Task or RegEx used to select packages? */

diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 05690964d43cd20e4ccf4074f21d9b6ad08a5655..6235ef9f5870a356a17a11bceb1d1c7d405aba8e 100644 (file)
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -22,15 +22,12 @@ enum class APT_CMD {
    APT_MARK,
    APT_SORTPKG,
 };
    APT_MARK,
    APT_SORTPKG,
 };

-
-APT_PUBLIC bool ShowHelp(CommandLine &CmdL) APT_WEAK;

 struct aptDispatchWithHelp
 {
    const char *Match;
    bool (*Handler)(CommandLine &);
    const char *Help;
 };
 struct aptDispatchWithHelp
 {
    const char *Match;
    bool (*Handler)(CommandLine &);
    const char *Help;
 };

-APT_PUBLIC std::vector<aptDispatchWithHelp> GetCommands() APT_WEAK;

 
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
 
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],

diff --git a/apt-private/private-download.h b/apt-private/private-download.h
index 5871651662ff4515bd4696bac35efdcf23b16095..d829e8b24b7d31bdbf13eddebb45984b5e8b5017 100644 (file)
--- a/apt-private/private-download.h
+++ b/apt-private/private-download.h
@@ -10,15 +10,15 @@
 #include <vector>
 
 // Check if all files in the fetcher are authenticated
 #include <vector>
 
 // Check if all files in the fetcher are authenticated

-APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);
+bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser);

 
 // show a authentication warning prompt and return true if the system
 // should continue
 
 // show a authentication warning prompt and return true if the system
 // should continue

-APT_PUBLIC bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const PromptUser);
+bool AuthPrompt(std::vector<std::string> const &UntrustedList, bool const PromptUser);

 
 APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure);
 
 
 APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure);
 

-APT_PUBLIC bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long FetchBytes);
+bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long FetchBytes);

 
 class APT_PUBLIC aptAcquireWithTextStatus : public pkgAcquire
 {
 
 class APT_PUBLIC aptAcquireWithTextStatus : public pkgAcquire
 {

diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 551787c3807ad17ec8bf8dc411cde607958b924b..7a8cd551349cb732d10b66701abbd900f0e57083 100644 (file)
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -28,7 +28,7 @@ APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
 
 // TryToInstall - Mark a package for installation                      /*{{{*/
 
 
 // TryToInstall - Mark a package for installation                      /*{{{*/

-struct APT_PUBLIC TryToInstall {
+struct TryToInstall {

    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool FixBroken;
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool FixBroken;


@@ -44,7 +44,7 @@ struct APT_PUBLIC TryToInstall {
 };
                                                                        /*}}}*/
 // TryToRemove - Mark a package for removal                            /*{{{*/
 };
                                                                        /*}}}*/
 // TryToRemove - Mark a package for removal                            /*{{{*/

-struct APT_PUBLIC TryToRemove {
+struct TryToRemove {

    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool PurgePkgs;
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool PurgePkgs;

diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 4930fd981d58f89dcf765d20214a70754ad72b51..8e4b50ed11bba7d231b6cb48627c6dd7fc55f980 100644 (file)
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -34,7 +34,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
 APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
 APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
 
 APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
 APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
 

-template<class Container, class PredicateC, class DisplayP, class DisplayV> APT_PUBLIC bool ShowList(std::ostream &out, std::string const &Title,
+template<class Container, class PredicateC, class DisplayP, class DisplayV> bool ShowList(std::ostream &out, std::string const &Title,

       Container const &cont,
       PredicateC Predicate,
       DisplayP PkgDisplay,
       Container const &cont,
       PredicateC Predicate,
       DisplayP PkgDisplay,

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index f68e739b164f6db8ed25a520a876a043761c2e1c..247f612c2a35bcfac2136b50cc91393be75fdb1f 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1100,7 +1100,7 @@ static bool GenCaches(CommandLine &)
    return CacheFile.BuildCaches(&Progress, true);
 }
                                                                        /*}}}*/
    return CacheFile.BuildCaches(&Progress, true);
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
     _("Usage: apt-cache [options] command\n"
 {
    std::cout <<
     _("Usage: apt-cache [options] command\n"


@@ -1115,7 +1115,7 @@ bool ShowHelp(CommandLine &)                                              /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"gencaches",&GenCaches, nullptr},
 {
    return {
       {"gencaches",&GenCaches, nullptr},

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d8a2d84cf3bc37b51384c4de0de0b32421e19515..ba01a4c7475aa0664f44b2a275dfeffd86ad06f1 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -203,7 +203,7 @@ static bool DoIdent(CommandLine &)
    return AddOrIdent(false);
 }
                                                                        /*}}}*/
    return AddOrIdent(false);
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt-cdrom [options] command\n"
 {
    std::cout <<
       _("Usage: apt-cdrom [options] command\n"


@@ -214,7 +214,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"add", &DoAdd, "Add a CDROM"},
 {
    return {
       {"add", &DoAdd, "Add a CDROM"},

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index b86a0fd976a20f7effd361213fc25634afcb5bc1..69485de9091f2e4c908404a3f5a0eec99255aba7 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -76,7 +76,7 @@ static bool DoDump(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt-config [options] command\n"
 {
    std::cout <<
       _("Usage: apt-config [options] command\n"


@@ -86,7 +86,7 @@ bool ShowHelp(CommandLine &)                                          /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"shell", &DoShell, _("get configuration values via shell evaluation")},
 {
    return {
       {"shell", &DoShell, _("get configuration values via shell evaluation")},

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index d1345400bae098ec564ff7ab39cfb79f3a81ac25..8f77425e4f7966af07bdf77990d9a6fcd5c98aba 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -215,7 +215,7 @@ bool DebFile::ParseInfo()
        return true;
 }
                                                                        /*}}}*/
        return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
        cout <<
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"
 {
        cout <<
                _("Usage: apt-extracttemplates file1 [file2 ...]\n"


@@ -330,7 +330,7 @@ static bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
        return !_error->PendingError();
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
        {nullptr, nullptr, nullptr}
 {
    return {
        {nullptr, nullptr, nullptr}

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b8d72a0bcdc177c240e8a068963fdbf9c55c91f2..3bd4834260eac6f838e4477bf888f09a60df6e45 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -343,7 +343,7 @@ static bool DoIndexTargets(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    if (_config->FindB("version") == true)
    {
 {
    if (_config->FindB("version") == true)
    {


@@ -399,7 +399,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"update", &DoUpdate, _("Retrieve new lists of packages")},
 {
    return {
       {"update", &DoUpdate, _("Retrieve new lists of packages")},

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 1be122ad0d9144e6d072b0290fc4d9cd80dc776f..c0575bea12c96c3f50eb0f085f12fd9dba24a4e6 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -105,7 +105,7 @@ static bool DoSrvLookup(CommandLine &CmdL)                          /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt-helper [options] command\n"
 {
    std::cout <<
       _("Usage: apt-helper [options] command\n"


@@ -116,7 +116,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"download-file", &DoDownloadFile, _("download the given uri to the target-path")},
 {
    return {
       {"download-file", &DoDownloadFile, _("download the given uri to the target-path")},

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 2491a8ebfa4d0f9dff26af665bd3b51457942842..8b615a83ba83b2c3840db2e4bc26afc5c9e27e7d 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -280,7 +280,7 @@ static bool ShowSelection(CommandLine &CmdL)                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 {
    std::cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"


@@ -292,7 +292,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"auto",&DoAuto, _("Mark the given packages as automatically installed")},
 {
    return {
       {"auto",&DoAuto, _("Mark the given packages as automatically installed")},

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 7e3301a052047a398d894c0775333e0a2417d884..9495ee354a04d3242d6ae79688a7d9e90f0441bc 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -132,7 +132,7 @@ static bool DoIt(string InFile)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
     _("Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 {
    std::cout <<
     _("Usage: apt-sortpkgs [options] file1 [file2 ...]\n"


@@ -143,7 +143,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {nullptr, nullptr, nullptr}
 {
    return {
       {nullptr, nullptr, nullptr}

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 64d374e1f268fe076157ddb6584e068a73e4555b..3c3d3ca1c88bf9005274b27f498e5587e956ce0a 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -40,7 +40,7 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt [options] command\n"
 {
    std::cout <<
       _("Usage: apt [options] command\n"


@@ -53,7 +53,7 @@ bool ShowHelp(CommandLine &)                                          /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       // query
 {
    return {
       // query

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 003a186be1ff91f380ef15f6e9009218f4482249..d985646f7ae7e7efb0144a2b2c64bc494dbf7e22 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -615,7 +615,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
     _("Usage: apt-ftparchive [options] command\n"
 {
    std::cout <<
     _("Usage: apt-ftparchive [options] command\n"


@@ -1029,7 +1029,7 @@ static bool Clean(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"packages",&SimpleGenPackages, nullptr},
 {
    return {
       {"packages",&SimpleGenPackages, nullptr},