aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-02-24 19:27:07 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-02-26 20:25:28 -0800
commit0ce8ee0e8a9109d043697b7e3402fe12d7ee7542 (patch)
tree103735899cbd6639157ee602359979ca85bebad0
parent036c588e36df46dbd7a41b595747eccef3b44833 (diff)
downloadpaludis-0ce8ee0e8a9109d043697b7e3402fe12d7ee7542.tar.gz
paludis-0ce8ee0e8a9109d043697b7e3402fe12d7ee7542.tar.xz
perform some dead code elimintation
Excise some dead code identified by clang
-rw-r--r--paludis/args/man.cc15
-rw-r--r--paludis/elike_package_dep_spec.cc6
-rw-r--r--paludis/repositories/e/ebuild.cc10
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc7
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc4
5 files changed, 3 insertions, 39 deletions
diff --git a/paludis/args/man.cc b/paludis/args/man.cc
index 6973ea4..ff1a4d4 100644
--- a/paludis/args/man.cc
+++ b/paludis/args/man.cc
@@ -90,21 +90,6 @@ namespace
{
}
};
-
- std::string escape_html_char(char c)
- {
- switch (c)
- {
- case '&':
- return "&amp;";
- case '<':
- return "&lt;";
- case '>':
- return "&gt;";
- default:
- return std::string(1, c);
- }
- }
}
diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index 23f227f..7240dfd 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -544,14 +544,14 @@ paludis::elike_add_package_requirement(const std::string & s, PartiallyMadePacka
{
throw PackageDepSpecError("Wildcard '*' not allowed here");
- if (0 != s.compare(s.length() - 2, 2, "/*"))
- result.package_name_part(PackageNamePart(s.substr(2)));
+ // if (0 != s.compare(s.length() - 2, 2, "/*"))
+ // result.package_name_part(PackageNamePart(s.substr(2)));
}
else if (s.length() >= 3 && (0 == s.compare(s.length() - 2, 2, "/*")))
{
throw PackageDepSpecError("Wildcard '*' not allowed here");
- result.category_name_part(CategoryNamePart(s.substr(0, s.length() - 2)));
+ // result.category_name_part(CategoryNamePart(s.substr(0, s.length() - 2)));
}
else
result.package(QualifiedPackageName(s));
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 066a315..4216210 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -420,16 +420,6 @@ EbuildMetadataCommand::in_metadata_generation() const
return true;
}
-namespace
-{
- std::string purdy(const std::string & s)
- {
- std::list<std::string> tokens;
- tokenise_whitespace(s, std::back_inserter(tokens));
- return join(tokens.begin(), tokens.end(), " \\n ");
- }
-}
-
bool
EbuildMetadataCommand::do_run_command(Process & process)
{
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index faeb2be..a825e27 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -46,13 +46,6 @@ using namespace paludis::erepository;
namespace
{
- void cannot_add(const std::shared_ptr<const DependencySpecTree> &) PALUDIS_ATTRIBUTE((noreturn));
-
- void cannot_add(const std::shared_ptr<const DependencySpecTree> &)
- {
- throw InternalError(PALUDIS_HERE, "Got weird tree");
- }
-
struct SlotRewriter
{
const Environment * const env;
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 284bbab..498d222 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -330,10 +330,6 @@ namespace
return o;
}
- void installed_this(const FSPath &)
- {
- }
-
bool ignore_nothing(const FSPath &)
{
return false;