From 73e96c6aef818f3bbf67bbd81a048f3eaf6f4300 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Wed, 7 Aug 2019 13:54:44 -0500 Subject: Comply with project formatting rules wrt 80 column lines --- src/build.h | 6 +++--- src/build_log.h | 7 ++++--- src/disk_interface.h | 6 ++++-- src/includes_normalize.h | 3 ++- src/manifest_parser.h | 3 ++- src/string_piece_util.cc | 1 - src/test.h | 3 ++- src/util.h | 3 ++- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/build.h b/src/build.h index 41120e1..2798693 100644 --- a/src/build.h +++ b/src/build.h @@ -224,9 +224,9 @@ struct Builder { BuildStatus* status_; private: - bool ExtractDeps(CommandRunner::Result* result, const std::string& deps_type, - const std::string& deps_prefix, std::vector* deps_nodes, - std::string* err); + bool ExtractDeps(CommandRunner::Result* result, const std::string& deps_type, + const std::string& deps_prefix, + std::vector* deps_nodes, std::string* err); DiskInterface* disk_interface_; DependencyScan scan_; diff --git a/src/build_log.h b/src/build_log.h index 842c467..88551e3 100644 --- a/src/build_log.h +++ b/src/build_log.h @@ -46,8 +46,8 @@ struct BuildLog { /// Prepares writing to the log file without actually opening it - that will /// happen when/if it's needed - bool OpenForWrite(const std::string& path, const BuildLogUser& user, std::string* err); - + bool OpenForWrite(const std::string& path, const BuildLogUser& user, + std::string* err); bool RecordCommand(Edge* edge, int start_time, int end_time, TimeStamp mtime = 0); void Close(); @@ -83,7 +83,8 @@ struct BuildLog { bool WriteEntry(FILE* f, const LogEntry& entry); /// Rewrite the known log entries, throwing away old data. - bool Recompact(const std::string& path, const BuildLogUser& user, std::string* err); + bool Recompact(const std::string& path, const BuildLogUser& user, + std::string* err); /// Restat all outputs in the log bool Restat(StringPiece path, const DiskInterface& disk_interface, diff --git a/src/disk_interface.h b/src/disk_interface.h index b75f1f6..bc29ab7 100644 --- a/src/disk_interface.h +++ b/src/disk_interface.h @@ -52,7 +52,8 @@ struct DiskInterface: public FileReader { /// Create a file, with the specified name and contents /// Returns true on success, false on failure - virtual bool WriteFile(const std::string& path, const std::string& contents) = 0; + virtual bool WriteFile(const std::string& path, + const std::string& contents) = 0; /// Remove the file named @a path. It behaves like 'rm -f path' so no errors /// are reported if it does not exists. @@ -77,7 +78,8 @@ struct RealDiskInterface : public DiskInterface { virtual TimeStamp Stat(const std::string& path, std::string* err) const; virtual bool MakeDir(const std::string& path); virtual bool WriteFile(const std::string& path, const std::string& contents); - virtual Status ReadFile(const std::string& path, std::string* contents, std::string* err); + virtual Status ReadFile(const std::string& path, std::string* contents, + std::string* err); virtual int RemoveFile(const std::string& path); /// Whether stat information can be cached. Only has an effect on Windows. diff --git a/src/includes_normalize.h b/src/includes_normalize.h index 1b852e1..7d50556 100644 --- a/src/includes_normalize.h +++ b/src/includes_normalize.h @@ -31,7 +31,8 @@ struct IncludesNormalize { /// Normalize by fixing slashes style, fixing redundant .. and . and makes the /// path |input| relative to |this->relative_to_| and store to |result|. - bool Normalize(const std::string& input, std::string* result, std::string* err) const; + bool Normalize(const std::string& input, std::string* result, + std::string* err) const; private: std::string relative_to_; diff --git a/src/manifest_parser.h b/src/manifest_parser.h index 887be50..954cf46 100644 --- a/src/manifest_parser.h +++ b/src/manifest_parser.h @@ -51,7 +51,8 @@ struct ManifestParser : public Parser { private: /// Parse a file, given its contents as a string. - bool Parse(const std::string& filename, const std::string& input, std::string* err); + bool Parse(const std::string& filename, const std::string& input, + std::string* err); /// Parse various statement types. bool ParsePool(std::string* err); diff --git a/src/string_piece_util.cc b/src/string_piece_util.cc index 5a77294..69513f5 100644 --- a/src/string_piece_util.cc +++ b/src/string_piece_util.cc @@ -17,7 +17,6 @@ #include #include #include - using namespace std; vector SplitStringPiece(StringPiece input, char sep) { diff --git a/src/test.h b/src/test.h index 7fee55e..4552c34 100644 --- a/src/test.h +++ b/src/test.h @@ -147,7 +147,8 @@ struct VirtualFileSystem : public DiskInterface { virtual TimeStamp Stat(const std::string& path, std::string* err) const; virtual bool WriteFile(const std::string& path, const std::string& contents); virtual bool MakeDir(const std::string& path); - virtual Status ReadFile(const std::string& path, std::string* contents, std::string* err); + virtual Status ReadFile(const std::string& path, std::string* contents, + std::string* err); virtual int RemoveFile(const std::string& path); /// An entry for a single in-memory file. diff --git a/src/util.h b/src/util.h index b2ba1cd..4e6ebb8 100644 --- a/src/util.h +++ b/src/util.h @@ -56,7 +56,8 @@ void Error(const char* msg, ...); /// Canonicalize a path like "foo/../bar.h" into just "bar.h". /// |slash_bits| has bits set starting from lowest for a backslash that was /// normalized to a forward slash. (only used on Windows) -bool CanonicalizePath(std::string* path, uint64_t* slash_bits, std::string* err); +bool CanonicalizePath(std::string* path, uint64_t* slash_bits, + std::string* err); bool CanonicalizePath(char* path, size_t* len, uint64_t* slash_bits, std::string* err); -- cgit v0.12