Cleanup: Do not include unnecessary headers in blaze_util.h.
The header only uses std::string, std::vector, int and char types, and
thus all these headers do not need to be included there.
If necessary, they should be included in the relevant source files
instead.
--
Change-Id: Id1849a0f427016dcf732fe6bfc673e599e8d4b14
MOS_MIGRATED_REVID=92192506
diff --git a/src/main/cpp/blaze_util.cc b/src/main/cpp/blaze_util.cc
index 7b4c866..c44de09 100644
--- a/src/main/cpp/blaze_util.cc
+++ b/src/main/cpp/blaze_util.cc
@@ -22,11 +22,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <sys/xattr.h>
#include <unistd.h>
+
#include <sstream>
#include "src/main/cpp/util/errors.h"
@@ -34,6 +37,7 @@
#include "src/main/cpp/util/file.h"
#include "src/main/cpp/util/numbers.h"
#include "src/main/cpp/util/strings.h"
+#include "src/main/cpp/util/port.h"
using blaze_util::die;
using blaze_util::pdie;
diff --git a/src/main/cpp/blaze_util.h b/src/main/cpp/blaze_util.h
index e36691e..d9b0140 100644
--- a/src/main/cpp/blaze_util.h
+++ b/src/main/cpp/blaze_util.h
@@ -16,22 +16,12 @@
// Blaze client.
//
-#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H__
-#define DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H__
+#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
+#define DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
-#include <pwd.h>
-#include <stdarg.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
#include <string>
#include <vector>
-#include "src/main/cpp/util/exit_code.h"
-#include "src/main/cpp/util/numbers.h"
-#include "src/main/cpp/util/port.h"
-
namespace blaze {
using std::string;
@@ -87,8 +77,9 @@
// If 'arg' matches 'key=value', returns address of 'value'.
// If it matches 'key' alone, returns address of next_arg.
// Returns NULL otherwise.
-const char* GetUnaryOption(const char *arg, const char *next_arg,
- const char *key);
+const char* GetUnaryOption(const char *arg,
+ const char *next_arg,
+ const char *key);
// Returns true iff 'arg' equals 'key'.
// Dies with a syntax error if arg starts with 'key='.
@@ -121,4 +112,5 @@
bool CheckJavaVersionIsAtLeast(string jvm_version, string version_spec);
} // namespace blaze
-#endif // DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H__
+
+#endif // DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
diff --git a/src/main/cpp/blaze_util_linux.cc b/src/main/cpp/blaze_util_linux.cc
index e128a2b..b905963 100644
--- a/src/main/cpp/blaze_util_linux.cc
+++ b/src/main/cpp/blaze_util_linux.cc
@@ -13,11 +13,12 @@
// limitations under the License.
#include <limits.h>
+#include <pwd.h>
#include <string.h> // strerror
#include <sys/statfs.h>
-#include <unistd.h>
#include <sys/types.h>
-#include <pwd.h>
+#include <sys/socket.h>
+#include <unistd.h>
#include "src/main/cpp/blaze_util.h"
#include "src/main/cpp/blaze_util_platform.h"
