criss-cross merge with my sid branch

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index d3d6e27398f07f3d0ebdd36bfcff62919d084c9e..3bbaf5f3045dc6d3464325dbe75179ab8c34b093 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1005,16 +1005,17 @@ bool TokSplitString(char Tok,char *Input,char **List,
 /* 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) {
-       string::const_iterator start = haystack.begin();
-       string::const_iterator end = start;
-       vector<string> exploded;
-       do {
-               for (; end != haystack.end() && *end != split; ++end);
-               exploded.push_back(string(start, end));
-               start = end + 1;
-       } while (end != haystack.end() && (++end) != haystack.end());
-       return exploded;
+vector<string> ExplodeString(string const &haystack, char const &split)
+{
+   string::const_iterator start = haystack.begin();
+   string::const_iterator end = start;
+   vector<string> exploded;
+   do {
+      for (; end != haystack.end() && *end != split; ++end);
+      exploded.push_back(string(start, end));
+      start = end + 1;
+   } while (end != haystack.end() && (++end) != haystack.end());
+   return exploded;
 }
                                                                        /*}}}*/
 // RegexChoice - Simple regex list/list matcher                                /*{{{*/

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 3bdb65b4dfb9dd12c9dda93e3db5f6aad71b4ad5..d65f975d212acc39443672e2cbf5c315c9b06fe8 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -59,7 +59,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);
-vector<string> ExplodeString(string const &haystack, char const &split=',');
+vector<string> ExplodeString(string const &haystack, char const &split);
 void ioprintf(ostream &out,const char *format,...) APT_FORMAT2;
 void strprintf(string &out,const char *format,...) APT_FORMAT2;
 char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3;