This is an archive of the discontinued LLVM Phabricator instance.

Differential D60653

Correctly check if a warning message lacks a trailing new line
ClosedPublic

Authored by teemperor on Apr 13 2019, 10:25 AM.

Details

Reviewers
clayborg
Commits
rG376230c9ef17: Correctly check if a warning message lacks a trailing new line
rLLDB358477: Correctly check if a warning message lacks a trailing new line
rL358477: Correctly check if a warning message lacks a trailing new line
Summary

Fixes LLVM bug 41489.

Diff Detail

Repository
rL LLVM

Event Timeline

teemperor created this revision.Apr 13 2019, 10:25 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 13 2019, 10:25 AM
Herald added a subscriber: lldb-commits. · View Herald Transcript
clayborg accepted this revision.Apr 15 2019, 3:14 PM
This revision is now accepted and ready to land.Apr 15 2019, 3:14 PM
Closed by commit rL358477: Correctly check if a warning message lacks a trailing new line (authored by teemperor). · Explain WhyApr 16 2019, 12:47 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptApr 16 2019, 12:47 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
source/
Core/
6 lines

Diff 195313

lldb/trunk/source/Core/Module.cpp

Show First 20 Lines • Show All 1,114 Lines • ▼ Show 20 Lines if (format && format[0]) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
strm.PrintfVarArg(format, args); strm.PrintfVarArg(format, args);
va_end(args); va_end(args);
const int format_len = strlen(format); const int format_len = strlen(format);
if (format_len > 0) { if (format_len > 0) {
const char last_char = format[format_len - 1]; const char last_char = format[format_len - 1];
if (last_char != '\n' || last_char != '\r') if (last_char != '\n' && last_char != '\r')
strm.EOL(); strm.EOL();
} }
Host::SystemLog(Host::eSystemLogError, "%s", strm.GetData()); Host::SystemLog(Host::eSystemLogError, "%s", strm.GetData());
} }
} }
bool Module::FileHasChanged() const { bool Module::FileHasChanged() const {
if (!m_file_has_changed) if (!m_file_has_changed)
Show All 15 Lines if (FileHasChanged()) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
strm.PrintfVarArg(format, args); strm.PrintfVarArg(format, args);
va_end(args); va_end(args);
const int format_len = strlen(format); const int format_len = strlen(format);
if (format_len > 0) { if (format_len > 0) {
const char last_char = format[format_len - 1]; const char last_char = format[format_len - 1];
if (last_char != '\n' || last_char != '\r') if (last_char != '\n' && last_char != '\r')
strm.EOL(); strm.EOL();
} }
strm.PutCString("The debug session should be aborted as the original " strm.PutCString("The debug session should be aborted as the original "
"debug information has been overwritten.\n"); "debug information has been overwritten.\n");
Host::SystemLog(Host::eSystemLogError, "%s", strm.GetData()); Host::SystemLog(Host::eSystemLogError, "%s", strm.GetData());
} }
} }
} }
Show All 9 Lines if (format && format[0]) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
strm.PrintfVarArg(format, args); strm.PrintfVarArg(format, args);
va_end(args); va_end(args);
const int format_len = strlen(format); const int format_len = strlen(format);
if (format_len > 0) { if (format_len > 0) {
const char last_char = format[format_len - 1]; const char last_char = format[format_len - 1];
if (last_char != '\n' || last_char != '\r') if (last_char != '\n' && last_char != '\r')
strm.EOL(); strm.EOL();
} }
Host::SystemLog(Host::eSystemLogWarning, "%s", strm.GetData()); Host::SystemLog(Host::eSystemLogWarning, "%s", strm.GetData());
} }
} }
void Module::LogMessage(Log *log, const char *format, ...) { void Module::LogMessage(Log *log, const char *format, ...) {
if (log != nullptr) { if (log != nullptr) {
▲ Show 20 Lines • Show All 482 Lines • Show Last 20 Lines