summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/configuration.cc5
-rw-r--r--apt-pkg/contrib/configuration.h2
-rw-r--r--test/libapt/configuration_test.cc2
3 files changed, 5 insertions, 4 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 43533e5bb..95c7cb96e 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -405,8 +405,9 @@ void Configuration::Clear(string const &Name, string const &Value)
}
/*}}}*/
-// Configuration::ClearAll - Clear everything /*{{{*/
-void Configuration::ClearAll()
+// Configuration::Clear - Clear everything /*{{{*/
+// ---------------------------------------------------------------------
+void Configuration::Clear()
{
const Configuration::Item *Top = Tree(0);
while( Top != 0 )
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 181ef696b..d9c6a30b5 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -94,7 +94,7 @@ class Configuration
// clear a whole tree
void Clear(const std::string &Name);
- void ClearAll();
+ void Clear();
// remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
void Clear(std::string const &List, std::string const &Value);
diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 5ec48834a..5120e86c9 100644
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -81,7 +81,7 @@ int main(int argc,const char *argv[]) {
equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
Cnf.Set("Moo::Bar", "1");
- Cnf.ClearAll();
+ Cnf.Clear();
equals(Cnf.Find("Moo::Bar"), "");
//FIXME: Test for configuration file parsing;