diff options
| -rw-r--r-- | clang/include/clang/Basic/PlistSupport.h | 15 | ||||
| -rw-r--r-- | clang/lib/ARCMigrate/PlistReporter.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/clang/include/clang/Basic/PlistSupport.h b/clang/include/clang/Basic/PlistSupport.h index d5a347b33f9..be1304ef797 100644 --- a/clang/include/clang/Basic/PlistSupport.h +++ b/clang/include/clang/Basic/PlistSupport.h @@ -19,12 +19,6 @@ namespace clang { namespace markup { typedef llvm::DenseMap<FileID, unsigned> FIDMap; -static const char *PlistHeader = - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" " - "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" - "<plist version=\"1.0\">\n"; - static inline void AddFID(FIDMap &FIDs, SmallVectorImpl<FileID> &V, const SourceManager &SM, SourceLocation L) { FileID FID = SM.getFileID(SM.getExpansionLoc(L)); @@ -49,6 +43,15 @@ static inline raw_ostream &Indent(raw_ostream &o, const unsigned indent) { return o; } +static inline raw_ostream &EmitPlistHeader(raw_ostream &o) { + static const char *PlistHeader = + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" " + "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n" + "<plist version=\"1.0\">\n"; + return o << PlistHeader; +} + static inline raw_ostream &EmitInteger(raw_ostream &o, int64_t value) { o << "<integer>"; o << value; diff --git a/clang/lib/ARCMigrate/PlistReporter.cpp b/clang/lib/ARCMigrate/PlistReporter.cpp index 09cb50512c2..6b34ef0c2b9 100644 --- a/clang/lib/ARCMigrate/PlistReporter.cpp +++ b/clang/lib/ARCMigrate/PlistReporter.cpp @@ -63,8 +63,7 @@ void arcmt::writeARCDiagsToPlist(const std::string &outPath, return; } - // Write the plist header. - o << PlistHeader; + EmitPlistHeader(o); // Write the root object: a <dict> containing... // - "files", an <array> mapping from FIDs to file names diff --git a/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp index ff2735db26d..ba3ad2ef16c 100644 --- a/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ b/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -345,8 +345,7 @@ void PlistDiagnostics::FlushDiagnosticsImpl( return; } - // Write the plist header. - o << PlistHeader; + EmitPlistHeader(o); // Write the root object: a <dict> containing... // - "clang_version", the string representation of clang version |
