summaryrefslogtreecommitdiffstats
path: root/net/ftp
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 23:37:02 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 23:37:02 +0000
commit17350d35a047286d79010e0abfea3d84722d3dc7 (patch)
tree273c226b2d0eebdbb287dc04f260c7541775b297 /net/ftp
parentbd52a98b4ef0149a544c45a3dbf870ce3f384688 (diff)
downloadchromium_src-17350d35a047286d79010e0abfea3d84722d3dc7.zip
chromium_src-17350d35a047286d79010e0abfea3d84722d3dc7.tar.gz
chromium_src-17350d35a047286d79010e0abfea3d84722d3dc7.tar.bz2
Make SplitString() and variants clear their outparam vector. (Note that SplitStringIntoKeyValues() and SplitStringIntoKeyValuePairs() already did this.) This is more in line with what other APIs that take outparams do.
I audited all callers, and the only ones affected by this are the buggy ones in bug 134695 that already wanted this behavior, as well as the couple of places in this CL that were manually calling clear() and now don't have to. BUG=134695 TEST=none TBR=brettw,phajdan.jr Review URL: https://chromiumcodereview.appspot.com/10684003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
-rw-r--r--net/ftp/ftp_directory_listing_parser_vms.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ftp/ftp_directory_listing_parser_vms.cc b/net/ftp/ftp_directory_listing_parser_vms.cc
index 9a8a2f7..923f25e 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -217,7 +217,6 @@ bool ParseFtpDirectoryListingVms(
return false;
// Join the current and next line and split them into columns.
- columns.clear();
base::SplitString(
CollapseWhitespace(lines[i] + ASCIIToUTF16(" ") + lines[i + 1],
false),