Michael Vogt лет назад: 13
Родитель
Сommit
62b66f2593

+ 3 - 2
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 )

+ 1 - 1
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);

+ 1 - 1
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;