rename ExplodeString to VectorizeString

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index a1379ce7d0478a0fe467fede34433fce33b2ed4b..2acf8dd9f08b64bcb2be328ef0e6351b9ae28a49 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -221,7 +221,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
        string envLang = Locale == 0 ? language_env : *(Locale+1);
        if (envLang.empty() == false) {
        const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
        string envLang = Locale == 0 ? language_env : *(Locale+1);
        if (envLang.empty() == false) {

-               std::vector<string> env = ExplodeString(envLang,':');
+               std::vector<string> env = VectorizeString(envLang,':');

                short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
                for (std::vector<string>::const_iterator e = env.begin();
                     e != env.end() && addedLangs < 3; ++e) {
                short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
                for (std::vector<string>::const_iterator e = env.begin();
                     e != env.end() && addedLangs < 3; ++e) {

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ab47cdede0d93abeb305f1c2c8f3438de24af2c7..7eb986ac0f4bc5a0a33e321a71c8f46e33ce9fe3 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1000,12 +1000,12 @@ bool TokSplitString(char Tok,char *Input,char **List,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// ExplodeString - Split a string up into a vector                     /*{{{*/
+// VectorizeString - Split a string up into a vector of strings                /*{{{*/

 // ---------------------------------------------------------------------
 /* This can be used to split a given string up into a vector, so the
    propose is the same as in the method above and this one is a bit slower
 // ---------------------------------------------------------------------
 /* This can be used to split a given string up into a vector, so the
    propose is the same as in the method above and this one is a bit slower

-   also, but the advantage is that we an iteratable vector */
-vector<string> ExplodeString(string const &haystack, char const &split)
+   also, but the advantage is that we have an iteratable vector */
+vector<string> VectorizeString(string const &haystack, char const &split)

 {
    string::const_iterator start = haystack.begin();
    string::const_iterator end = start;
 {
    string::const_iterator start = haystack.begin();
    string::const_iterator end = start;

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index cdf78f317773e4b14ce7c4039bbd0e2643e718f9..d8070d3f597bb15df57d7f6de508831cf86b3b55 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -52,7 +52,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0)
 bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
 bool TokSplitString(char Tok,char *Input,char **List,
                    unsigned long ListMax);
 bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
 bool TokSplitString(char Tok,char *Input,char **List,
                    unsigned long ListMax);

-vector<string> ExplodeString(string const &haystack, char const &split);
+vector<string> VectorizeString(string const &haystack, char const &split) __attrib_const;

 void ioprintf(ostream &out,const char *format,...) __like_printf(2);
 void strprintf(string &out,const char *format,...) __like_printf(2);
 char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3);
 void ioprintf(ostream &out,const char *format,...) __like_printf(2);
 void strprintf(string &out,const char *format,...) __like_printf(2);
 char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3);

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 947a7f04beef4b81f9620a790f37fd8a22d45ae6..8df3ed18d4399c1b15567dd80a2c6c01efa0932f 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -313,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type
    {
       map<string, string>::const_iterator const arch = Options.find("arch");
       vector<string> const Archs =
    {
       map<string, string>::const_iterator const arch = Options.find("arch");
       vector<string> const Archs =

-               (arch != Options.end()) ? ExplodeString(arch->second, ',') :
+               (arch != Options.end()) ? VectorizeString(arch->second, ',') :

                                APT::Configuration::getArchitectures();
 
       for (vector<metaIndex *>::const_iterator I = List.begin();
                                APT::Configuration::getArchitectures();
 
       for (vector<metaIndex *>::const_iterator I = List.begin();