Make mime sniffer compile for Mac.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1092 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
net
@@ -120,7 +120,6 @@
|
||||
#include "base/basictypes.h"
|
||||
#include "base/histogram.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/registry.h"
|
||||
#include "base/string_util.h"
|
||||
#include "googleurl/src/gurl.h"
|
||||
#include "net/base/mime_util.h"
|
||||
@@ -312,7 +311,7 @@ static bool MatchMagicNumber(const char* content, size_t size,
|
||||
if (magic_entry->is_string) {
|
||||
if (content_strlen >= len) {
|
||||
// String comparisons are case-insensitive
|
||||
match = (_strnicmp(magic_entry->magic, content, len) == 0);
|
||||
match = (base::strncasecmp(magic_entry->magic, content, len) == 0);
|
||||
}
|
||||
} else {
|
||||
if (size >= len)
|
||||
@@ -403,11 +402,11 @@ static bool SniffXML(const char* content, size_t size, std::string* result) {
|
||||
if (!pos)
|
||||
return false;
|
||||
|
||||
if (_strnicmp(pos, "<?xml", sizeof("<?xml")-1) == 0) {
|
||||
if (base::strncasecmp(pos, "<?xml", sizeof("<?xml")-1) == 0) {
|
||||
// Skip XML declarations.
|
||||
++pos;
|
||||
continue;
|
||||
} else if (_strnicmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE")-1) == 0) {
|
||||
} else if (base::strncasecmp(pos, "<!DOCTYPE", sizeof("<!DOCTYPE")-1) == 0) {
|
||||
// Skip DOCTYPE declarations.
|
||||
++pos;
|
||||
continue;
|
||||
@@ -498,7 +497,7 @@ static bool IsUnknownMimeType(const std::string& mime_type) {
|
||||
};
|
||||
static SnifferHistogram counter(L"mime_sniffer.kUnknownMimeTypes",
|
||||
arraysize(kUnknownMimeTypes) + 1);
|
||||
for (int i = 0; i < arraysize(kUnknownMimeTypes); ++i) {
|
||||
for (size_t i = 0; i < arraysize(kUnknownMimeTypes); ++i) {
|
||||
if (mime_type == kUnknownMimeTypes[i]) {
|
||||
counter.Add(i);
|
||||
return true;
|
||||
@@ -536,7 +535,7 @@ bool ShouldSniffMimeType(const GURL& url, const std::string& mime_type) {
|
||||
};
|
||||
static SnifferHistogram counter(L"mime_sniffer.kSniffableTypes",
|
||||
arraysize(kSniffableTypes) + 1);
|
||||
for (int i = 0; i < arraysize(kSniffableTypes); ++i) {
|
||||
for (size_t i = 0; i < arraysize(kSniffableTypes); ++i) {
|
||||
if (mime_type == kSniffableTypes[i]) {
|
||||
counter.Add(i);
|
||||
return true;
|
||||
|
@@ -80,6 +80,7 @@
|
||||
7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BA04540E25613300BE02C6 /* libnet.a */; };
|
||||
7BED34450E5A1A9600A747DB /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED324A0E5A17C000A747DB /* libbase.a */; };
|
||||
7BED34520E5A1ABC00A747DB /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED32530E5A17C300A747DB /* libgtest.a */; };
|
||||
82ECB3090E5B651D00A913E3 /* mime_sniffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AD0E5A181C00A747DB /* mime_sniffer.cc */; };
|
||||
E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4AFA6420E5241B400201347 /* run_all_unittests.cc */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
@@ -1182,6 +1183,7 @@
|
||||
7B8504330E5B2E4900730B43 /* mem_backend_impl.cc in Sources */,
|
||||
7B8504340E5B2E4900730B43 /* mem_entry_impl.cc in Sources */,
|
||||
7B8504350E5B2E4900730B43 /* mem_rankings.cc in Sources */,
|
||||
82ECB3090E5B651D00A913E3 /* mime_sniffer.cc in Sources */,
|
||||
048268070E5B3B1000A30786 /* mime_util.cc in Sources */,
|
||||
7BA015550E5A1C1000044150 /* net_errors.cc in Sources */,
|
||||
7B8504390E5B2E5700730B43 /* net_module.cc in Sources */,
|
||||
|
Reference in New Issue
Block a user