--- IniDBBuilderPackage.cc | 4 ++-- Makefile.am | 1 + package_depends.cc | 33 +++++++++++++++++++++++++++++++++ package_depends.h | 3 +++ package_meta.cc | 2 +- package_version.cc | 18 ------------------ package_version.h | 3 --- 7 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 package_depends.cc
diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc index 7f500d6..b5b5f4c 100644 --- a/IniDBBuilderPackage.cc +++ b/IniDBBuilderPackage.cc @@ -77,7 +77,7 @@ IniDBBuilderPackage::buildPackage (const std::string& name) { Log (LOG_BABBLE) << "Version " << cbpv.Canonical_version() << endLog; Log (LOG_BABBLE) << "Depends:"; - dumpAndList (cbpv.depends(), Log (LOG_BABBLE)); + dumpPackageDepends (cbpv.depends(), Log (LOG_BABBLE)); Log (LOG_BABBLE) << endLog; } } @@ -191,7 +191,7 @@ IniDBBuilderPackage::buildBeginDepends () #if DEBUG Log (LOG_BABBLE) << "Beginning of a depends statement for " << cp->name << endLog; - dumpAndList (currentNodeList, Log (LOG_BABBLE)); + dumpPackageDepends (currentNodeList, Log (LOG_BABBLE)); #endif currentSpec = NULL; currentNodeList = cbpv.depends(); diff --git a/Makefile.am b/Makefile.am index af89af5..d4c8472 100644 --- a/Makefile.am +++ b/Makefile.am @@ -203,6 +203,7 @@ inilint_SOURCES = \ package_db.cc \ package_db.h \ package_depends.h \ + package_depends.cc \ package_meta.cc \ package_meta.h \ package_source.cc \ diff --git a/package_depends.cc b/package_depends.cc new file mode 100644 index 0000000..e288c0b --- /dev/null +++ b/package_depends.cc @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2017 Jon Turney + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * A copy of the GNU General Public License can be found at + * http://www.gnu.org/ + * + */ + +#include <package_depends.h> +#include <LogSingleton.h> + +void +dumpPackageDepends (PackageDepends const *currentList, + std::ostream &logger) +{ + if (currentList) + { + Log (LOG_BABBLE) << "( "; + PackageDepends::const_iterator i = currentList->begin(); + while (true) + { + if (i == currentList->end()) break; + Log (LOG_BABBLE) << **i << " "; + ++i; + } + Log (LOG_BABBLE) << ")"; + } +} diff --git a/package_depends.h b/package_depends.h index 05e0dc6..af3fa01 100644 --- a/package_depends.h +++ b/package_depends.h @@ -14,8 +14,11 @@ #ifndef PACKAGE_DEPENDS_H #define PACKAGE_DEPENDS_H +#include <PackageSpecification.h> #include <vector> typedef std::vector <PackageSpecification *> PackageDepends; +void dumpPackageDepends (PackageDepends const *currentList, std::ostream &); + #endif // PACKAGE_DEPENDS_H diff --git a/package_meta.cc b/package_meta.cc index 208b948..b35b554 100644 --- a/package_meta.cc +++ b/package_meta.cc @@ -564,7 +564,7 @@ packagemeta::logAllVersions () const { std::ostream & logger = Log (LOG_BABBLE); logger << " depends="; - dumpAndList(i->depends(), logger); + dumpPackageDepends(i->depends(), logger); logger << endLog; } } diff --git a/package_version.cc b/package_version.cc index 6a903c5..f022e70 100644 --- a/package_version.cc +++ b/package_version.cc @@ -412,21 +412,3 @@ _packageversion::scripts() { return scripts_; } - -void -dumpAndList (PackageDepends const *currentList, - std::ostream &logger) -{ - if (currentList) - { - Log (LOG_BABBLE) << "( "; - PackageDepends::const_iterator i = currentList->begin(); - while (true) - { - if (i == currentList->end()) break; - Log (LOG_BABBLE) << **i << " "; - ++i; - } - Log (LOG_BABBLE) << ")"; - } -} diff --git a/package_version.h b/package_version.h index ff16eb8..d70eda0 100644 --- a/package_version.h +++ b/package_version.h @@ -196,7 +196,4 @@ protected: std::vector <Script> scripts_; }; -// not sure where this belongs :}. -void dumpAndList (PackageDepends const *currentList, std::ostream &); - #endif /* SETUP_PACKAGE_VERSION_H */ -- 2.12.3