diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 01:24:49 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 01:24:49 +0000 |
commit | f884f2a323456f31486f9dd33d704ee086475355 (patch) | |
tree | 100e319bc567577f46f2d1c615ddce2988940d5e | |
parent | 4db1f795e123d9e1a7e848278d066ec189a063f3 (diff) | |
download | chromium_src-f884f2a323456f31486f9dd33d704ee086475355.zip chromium_src-f884f2a323456f31486f9dd33d704ee086475355.tar.gz chromium_src-f884f2a323456f31486f9dd33d704ee086475355.tar.bz2 |
linux: uncontroversial cleanups found by clang
Part of a larger patch to use clang to warning-check our code.
Review URL: http://codereview.chromium.org/561008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37781 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | base/sys_string_conversions_linux.cc | 12 | ||||
-rw-r--r-- | base/unix_domain_socket_posix.cc | 1 | ||||
-rw-r--r-- | chrome/browser/renderer_host/render_view_host.h | 4 | ||||
-rw-r--r-- | ipc/ipc_message.h | 2 | ||||
-rw-r--r-- | net/base/address_list.cc | 6 |
5 files changed, 11 insertions, 14 deletions
diff --git a/base/sys_string_conversions_linux.cc b/base/sys_string_conversions_linux.cc index 118f0ac..4c4f5ed 100644 --- a/base/sys_string_conversions_linux.cc +++ b/base/sys_string_conversions_linux.cc @@ -40,7 +40,7 @@ std::string SysWideToNativeMB(const std::wstring& wide) { size_t res = src ? wcrtomb(buf, src, &ps) : 0; switch (res) { // Handle any errors and return an empty string. - case -1: + case static_cast<size_t>(-1): return std::string(); break; case 0: @@ -68,7 +68,7 @@ std::string SysWideToNativeMB(const std::wstring& wide) { size_t res = src ? wcrtomb(&out[j], src, &ps) : 0; switch (res) { // Handle any errors and return an empty string. - case -1: + case static_cast<size_t>(-1): return std::string(); break; case 0: @@ -96,8 +96,8 @@ std::wstring SysNativeMBToWide(const StringPiece& native_mb) { size_t res = mbrtowc(NULL, src, native_mb.size() - i, &ps); switch (res) { // Handle any errors and return an empty string. - case -2: - case -1: + case static_cast<size_t>(-2): + case static_cast<size_t>(-1): return std::wstring(); break; case 0: @@ -125,8 +125,8 @@ std::wstring SysNativeMBToWide(const StringPiece& native_mb) { size_t res = mbrtowc(dst, src, native_mb.size() - i, &ps); switch (res) { // Handle any errors and return an empty string. - case -2: - case -1: + case static_cast<size_t>(-2): + case static_cast<size_t>(-1): return std::wstring(); break; case 0: diff --git a/base/unix_domain_socket_posix.cc b/base/unix_domain_socket_posix.cc index 024c086..08c41cf 100644 --- a/base/unix_domain_socket_posix.cc +++ b/base/unix_domain_socket_posix.cc @@ -4,6 +4,7 @@ #include "base/unix_domain_socket_posix.h" +#include <errno.h> #include <unistd.h> #include <sys/uio.h> #include <sys/socket.h> diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 764be45..4b6f7e6 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -38,10 +38,6 @@ namespace gfx { class Point; } -namespace net { -enum LoadState; -} - namespace webkit_glue { class FormFieldValues; struct WebApplicationInfo; diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h index a9ad9a4..83e1e08 100644 --- a/ipc/ipc_message.h +++ b/ipc/ipc_message.h @@ -19,7 +19,7 @@ #endif namespace base { -class FileDescriptor; +struct FileDescriptor; } class FileDescriptorSet; diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 7952a75..93ec009 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -16,7 +16,7 @@ namespace { // Make a deep copy of |info|. This copy should be deleted using // DeleteCopyOfAddrinfo(), and NOT freeaddrinfo(). struct addrinfo* CreateCopyOfAddrinfo(const struct addrinfo* info) { - struct addrinfo* copy = new struct addrinfo; + struct addrinfo* copy = new addrinfo; // Copy all the fields (some of these are pointers, we will fix that next). memcpy(copy, info, sizeof(addrinfo)); @@ -124,8 +124,8 @@ void AddressList::Reset() { // static AddressList AddressList::CreateIPv6Address(unsigned char data[16]) { - struct addrinfo* ai = new struct addrinfo; - memset(ai, 0, sizeof(struct addrinfo)); + struct addrinfo* ai = new addrinfo; + memset(ai, 0, sizeof(addrinfo)); ai->ai_family = AF_INET6; ai->ai_socktype = SOCK_STREAM; |