summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 17:29:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 17:29:25 +0000
commite83326f8400791e92875546b2fd1885a3a17d1b1 (patch)
treeedbe773208b1a9f6965b45b55da10afd210ea7bb /base
parent8e0a03bf3b1aacaa7a2bc2561d8eb1b83eb9c2e5 (diff)
downloadchromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.zip
chromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.tar.gz
chromium_src-e83326f8400791e92875546b2fd1885a3a17d1b1.tar.bz2
Convert more callers of the integer/string functions to using
string_number_conversions.h TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3013046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/string_number_conversions.cc1
-rw-r--r--base/string_number_conversions.h1
-rw-r--r--base/sys_info_chromeos.cc8
3 files changed, 6 insertions, 4 deletions
diff --git a/base/string_number_conversions.cc b/base/string_number_conversions.cc
index d340151..62599dd 100644
--- a/base/string_number_conversions.cc
+++ b/base/string_number_conversions.cc
@@ -398,3 +398,4 @@ bool HexStringToBytes(const std::string& input, std::vector<uint8>* output) {
}
} // namespace base
+
diff --git a/base/string_number_conversions.h b/base/string_number_conversions.h
index 928cb8a..4d89e86 100644
--- a/base/string_number_conversions.h
+++ b/base/string_number_conversions.h
@@ -90,3 +90,4 @@ bool HexStringToBytes(const std::string& input, std::vector<uint8>* output);
} // namespace base
#endif // BASE_STRING_NUMBER_CONVERSIONS_H_
+
diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
index af204df..1cd9fb6 100644
--- a/base/sys_info_chromeos.cc
+++ b/base/sys_info_chromeos.cc
@@ -7,8 +7,8 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/string_number_conversions.h"
#include "base/string_tokenizer.h"
-#include "base/string_util.h"
namespace base {
@@ -54,12 +54,12 @@ void SysInfo::ParseLsbRelease(const std::string& lsb_release,
StringTokenizer tokenizer(version, ".");
for (int i = 0; i < 3 && tokenizer.GetNext(); i++) {
if (0 == i) {
- *major_version = StringToInt(tokenizer.token());
+ StringToInt(tokenizer.token(), major_version);
*minor_version = *bugfix_version = 0;
} else if (1 == i) {
- *minor_version = StringToInt(tokenizer.token());
+ StringToInt(tokenizer.token(), minor_version);
} else { // 2 == i
- *bugfix_version = StringToInt(tokenizer.token());
+ StringToInt(tokenizer.token(), bugfix_version);
}
}
}