summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2013-08-23 19:20:55 (GMT)
committerNico Weber <nicolasweber@gmx.de>2013-08-23 19:20:55 (GMT)
commitde3380aab6e18f4f31653f0efa502ad31db93797 (patch)
treeaad1306e5d9bca6318d0022bd03596529d1d874a /src
parenta694a746e3cb08ce0d0444c0c32fc1f7f45e6d8a (diff)
downloadNinja-de3380aab6e18f4f31653f0efa502ad31db93797.zip
Ninja-de3380aab6e18f4f31653f0efa502ad31db93797.tar.gz
Ninja-de3380aab6e18f4f31653f0efa502ad31db93797.tar.bz2
Minor style fixes, no behavior change.
Diffstat (limited to 'src')
-rw-r--r--src/build.h2
-rw-r--r--src/build_log.cc2
-rw-r--r--src/build_test.cc4
-rw-r--r--src/disk_interface.cc2
-rw-r--r--src/hash_map.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/build.h b/src/build.h
index aa96512..5b6c83c 100644
--- a/src/build.h
+++ b/src/build.h
@@ -51,7 +51,7 @@ struct Plan {
Edge* FindWork();
/// Returns true if there's more work to be done.
- bool more_to_do() const { return (wanted_edges_ > 0) && (command_edges_ > 0); }
+ bool more_to_do() const { return wanted_edges_ > 0 && command_edges_ > 0; }
/// Dumps the current state of the plan.
void Dump();
diff --git a/src/build_log.cc b/src/build_log.cc
index 1374bd0..b92a06f 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -54,7 +54,7 @@ uint64_t MurmurHash64A(const void* key, size_t len) {
const uint64_t m = BIG_CONSTANT(0xc6a4a7935bd1e995);
const int r = 47;
uint64_t h = seed ^ (len * m);
- const unsigned char * data = (const unsigned char *)key;
+ const unsigned char* data = (const unsigned char*)key;
while (len >= 8) {
uint64_t k;
memcpy(&k, data, sizeof k);
diff --git a/src/build_test.cc b/src/build_test.cc
index 94f3994..66d0954 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -1167,7 +1167,7 @@ TEST_F(BuildWithLogTest, RestatMissingInput) {
// See that an entry in the logfile is created, capturing
// the right mtime
- BuildLog::LogEntry * log_entry = build_log_.LookupByOutput("out1");
+ BuildLog::LogEntry* log_entry = build_log_.LookupByOutput("out1");
ASSERT_TRUE(NULL != log_entry);
ASSERT_EQ(restat_mtime, log_entry->restat_mtime);
@@ -1338,7 +1338,7 @@ TEST_F(BuildWithLogTest, RspFileCmdLineChange) {
// 3. Alter the entry in the logfile
// (to simulate a change in the command line between 2 builds)
- BuildLog::LogEntry * log_entry = build_log_.LookupByOutput("out");
+ BuildLog::LogEntry* log_entry = build_log_.LookupByOutput("out");
ASSERT_TRUE(NULL != log_entry);
ASSERT_NO_FATAL_FAILURE(AssertHash(
"cat out.rsp > out;rspfile=Original very long command",
diff --git a/src/disk_interface.cc b/src/disk_interface.cc
index ee3e99a..3233144 100644
--- a/src/disk_interface.cc
+++ b/src/disk_interface.cc
@@ -121,7 +121,7 @@ TimeStamp RealDiskInterface::Stat(const string& path) {
}
bool RealDiskInterface::WriteFile(const string& path, const string& contents) {
- FILE * fp = fopen(path.c_str(), "w");
+ FILE* fp = fopen(path.c_str(), "w");
if (fp == NULL) {
Error("WriteFile(%s): Unable to create file. %s",
path.c_str(), strerror(errno));
diff --git a/src/hash_map.h b/src/hash_map.h
index 919b6fc..c63aa88 100644
--- a/src/hash_map.h
+++ b/src/hash_map.h
@@ -25,7 +25,7 @@ unsigned int MurmurHash2(const void* key, size_t len) {
const unsigned int m = 0x5bd1e995;
const int r = 24;
unsigned int h = seed ^ len;
- const unsigned char * data = (const unsigned char *)key;
+ const unsigned char* data = (const unsigned char*)key;
while (len >= 4) {
unsigned int k;
memcpy(&k, data, sizeof k);