From e1930985430ce289f4fe8525f51050e5d78cc44e Mon Sep 17 00:00:00 2001
From: "ted.mielczarek" <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Fri, 25 Jun 2010 16:57:07 +0000
Subject: Breakpad: Avoid using the C++ <cfoo> headers.

This patch avoids unnecessary use of the <cfoo> headers in files that don't
actually use the identifiers they declare in the std:: namespace.

It also changes some files to better conform with the "Names and Order of
Includes" rules in the Google C++ Style Guide.

A=jimb R=mark

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@619 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/common/linux/dump_symbols.cc   | 13 +++++++------
 src/common/linux/dump_symbols.h    |  3 ++-
 src/common/linux/file_id.cc        |  9 +++++----
 src/common/linux/guid_creator.cc   | 12 ++++++------
 src/common/linux/http_upload.cc    |  6 +++---
 src/common/linux/libcurl_wrapper.h |  3 ++-
 6 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'src/common/linux')

diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc
index a9d2cb46..d8a78942 100644
--- a/src/common/linux/dump_symbols.cc
+++ b/src/common/linux/dump_symbols.cc
@@ -32,18 +32,20 @@
 // dump_symbols.cc: implement google_breakpad::WriteSymbolFile:
 // Find all the debugging info in a file and dump it as a Breakpad symbol file.
 
+#include "common/linux/dump_symbols.h"
+
+#include <assert.h>
 #include <elf.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <link.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <cassert>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <string>
 
 #include "common/dwarf/bytereader-inl.h"
@@ -51,7 +53,6 @@
 #include "common/dwarf_cfi_to_module.h"
 #include "common/dwarf_cu_to_module.h"
 #include "common/dwarf_line_to_module.h"
-#include "common/linux/dump_symbols.h"
 #include "common/linux/file_id.h"
 #include "common/module.h"
 #include "common/stabs_reader.h"
diff --git a/src/common/linux/dump_symbols.h b/src/common/linux/dump_symbols.h
index 0b6d0c02..5422b1c8 100644
--- a/src/common/linux/dump_symbols.h
+++ b/src/common/linux/dump_symbols.h
@@ -35,8 +35,9 @@
 #ifndef COMMON_LINUX_DUMP_SYMBOLS_H__
 #define COMMON_LINUX_DUMP_SYMBOLS_H__
 
+#include <stdio.h>
+
 #include <string>
-#include <cstdio>
 
 namespace google_breakpad {
 
diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc
index e76d0b0a..d2461b9c 100644
--- a/src/common/linux/file_id.cc
+++ b/src/common/linux/file_id.cc
@@ -33,21 +33,22 @@
 //
 
 #include "common/linux/file_id.h"
-#include "common/linux/linux_libc_support.h"
-#include "common/linux/linux_syscall_support.h"
 
 #include <arpa/inet.h>
+#include <assert.h>
 #include <elf.h>
 #include <fcntl.h>
 #include <link.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
-#include <cassert>
-#include <cstdio>
+
+#include "common/linux/linux_libc_support.h"
+#include "common/linux/linux_syscall_support.h"
 
 namespace google_breakpad {
 
diff --git a/src/common/linux/guid_creator.cc b/src/common/linux/guid_creator.cc
index 7611cc3e..678f5904 100644
--- a/src/common/linux/guid_creator.cc
+++ b/src/common/linux/guid_creator.cc
@@ -27,14 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <unistd.h>
-
 #include "common/linux/guid_creator.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
 //
 // GUIDGenerator
 //
diff --git a/src/common/linux/http_upload.cc b/src/common/linux/http_upload.cc
index f0f9a6de..1ab4b12b 100644
--- a/src/common/linux/http_upload.cc
+++ b/src/common/linux/http_upload.cc
@@ -27,14 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cassert>
+#include "common/linux/http_upload.h"
+
+#include <assert.h>
 #include <dlfcn.h>
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/types.h>
 
-#include "common/linux/http_upload.h"
-
 namespace {
 
 // Callback to get the response data from server.
diff --git a/src/common/linux/libcurl_wrapper.h b/src/common/linux/libcurl_wrapper.h
index 08aa9586..ce549889 100644
--- a/src/common/linux/libcurl_wrapper.h
+++ b/src/common/linux/libcurl_wrapper.h
@@ -30,9 +30,10 @@
 // A wrapper for libcurl to do HTTP Uploads, to support easy mocking
 // and unit testing of the HTTPUpload class.
 
+#include <curl/curl.h>
+
 #include <string>
 #include <map>
-#include <curl/curl.h>
 
 namespace google_breakpad {
 class LibcurlWrapper {
-- 
cgit v1.2.1