diff options
| -rw-r--r-- | net/base/mime_util.cc | 10 | ||||
| -rw-r--r-- | net/http/http_auth_gssapi_posix.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index e8d1813..346b2ea 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -760,7 +760,7 @@ namespace { // From http://www.w3schools.com/media/media_mimeref.asp and // http://plugindoc.mozdev.org/winmime.php -static const char* kStandardImageTypes[] = { +static const char* const kStandardImageTypes[] = { "image/bmp", "image/cis-cod", "image/gif", @@ -784,7 +784,7 @@ static const char* kStandardImageTypes[] = { "image/x-xpixmap", "image/x-xwindowdump" }; -static const char* kStandardAudioTypes[] = { +static const char* const kStandardAudioTypes[] = { "audio/aac", "audio/aiff", "audio/amr", @@ -803,7 +803,7 @@ static const char* kStandardAudioTypes[] = { "audio/vnd.rn-realaudio", "audio/vnd.wave" }; -static const char* kStandardVideoTypes[] = { +static const char* const kStandardVideoTypes[] = { "video/avi", "video/divx", "video/flc", @@ -822,7 +822,7 @@ static const char* kStandardVideoTypes[] = { struct StandardType { const char* leading_mime_type; - const char** standard_types; + const char* const* standard_types; size_t standard_types_len; }; static const StandardType kStandardTypes[] = { @@ -855,7 +855,7 @@ void GetExtensionsFromHardCodedMappings( } } -void GetExtensionsHelper(const char** standard_types, +void GetExtensionsHelper(const char* const* standard_types, size_t standard_types_len, const std::string& leading_mime_type, base::hash_set<FilePath::StringType>* extensions) { diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index 7121406..f79d1c8 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -419,7 +419,7 @@ bool GSSAPISharedLibrary::InitImpl() { } base::NativeLibrary GSSAPISharedLibrary::LoadSharedLibrary() { - const char** library_names; + const char* const* library_names; size_t num_lib_names; const char* user_specified_library[1]; if (!gssapi_library_name_.empty()) { @@ -427,7 +427,7 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLibrary() { library_names = user_specified_library; num_lib_names = 1; } else { - static const char* kDefaultLibraryNames[] = { + static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "libgssapi_krb5.dylib" // MIT Kerberos #elif defined(OS_OPENBSD) |