diff options
| author | kristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:02:48 +0000 |
|---|---|---|
| committer | kristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:02:48 +0000 |
| commit | ae136434259c31f34260226df07722188141acff (patch) | |
| tree | b2a72dce7eb4e3960e24cd5fde35b4ee65921b50 | |
| parent | 29d8b1a71e00cf8dd6152470129e8b3910e37118 (diff) | |
| download | chromium_src-ae136434259c31f34260226df07722188141acff.zip chromium_src-ae136434259c31f34260226df07722188141acff.tar.gz chromium_src-ae136434259c31f34260226df07722188141acff.tar.bz2 | |
Fixing some warning due to different signess of char
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8354008
Review URL: http://codereview.chromium.org/8354008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110968 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/string_split.cc | 10 | ||||
| -rw-r--r-- | net/base/dns_util.cc | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/base/string_split.cc b/base/string_split.cc index cb9ee7a..cdf708b 100644 --- a/base/string_split.cc +++ b/base/string_split.cc @@ -45,7 +45,10 @@ void SplitString(const string16& str, void SplitString(const std::string& str, char c, std::vector<std::string>* r) { - DCHECK(c >= 0 && c < 0x7F); +#if CHAR_MIN < 0 + DCHECK(c >= 0); +#endif + DCHECK(c < 0x7F); SplitStringT(str, c, true, r); } @@ -156,7 +159,10 @@ void SplitStringDontTrim(const std::string& str, char c, std::vector<std::string>* r) { DCHECK(IsStringUTF8(str)); - DCHECK(c >= 0 && c < 0x7F); +#if CHAR_MIN < 0 + DCHECK(c >= 0); +#endif + DCHECK(c < 0x7F); SplitStringT(str, c, false, r); } diff --git a/net/base/dns_util.cc b/net/base/dns_util.cc index 8051ca1..93d789e 100644 --- a/net/base/dns_util.cc +++ b/net/base/dns_util.cc @@ -60,7 +60,11 @@ std::string DNSDomainToString(const std::string& domain) { std::string ret; for (unsigned i = 0; i < domain.size() && domain[i]; i += domain[i] + 1) { - if (domain[i] < 0 || domain[i] > 63) +#if CHAR_MIN < 0 + if (domain[i] < 0) + return ""; +#endif + if (domain[i] > 63) return ""; if (i) |