criss-cross merge with my sid branch

1 files changed, 11 insertions, 10 deletions

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index d3d6e2739..3bbaf5f30 100644
--- 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				/*{{{*/