[Lldb-commits] [lldb] r140185 - in /lldb/trunk: include/lldb/API/ include/lldb/Core/ include/lldb/Host/ include/lldb/Interpreter/ source/API/ source/Breakpoint/ source/Commands/ source/Core/ source/Expression/ source/Interpreter/ source/Plugins/DynamicLoader/Darwin-Kernel/ source/Plugins/DynamicLoader/MacOSX-DYLD/ source/Plugins/ObjectContainer/BSD-Archive/ source/Plugins/ObjectContainer/Universal-Mach-O/ source/Plugins/ObjectFile/ELF/ source/Plugins/ObjectFile/Mach-O/ source/Plugins/ObjectFile/PECOFF/ source/Plugins/P...
Jason Molenda
jmolenda at apple.com
Tue Sep 20 14:44:10 PDT 2011
Author: jmolenda
Date: Tue Sep 20 16:44:10 2011
New Revision: 140185
URL: http://llvm.org/viewvc/llvm-project?rev=140185&view=rev
Log:
Update declarations for all functions/methods that accept printf-style
stdarg formats to use __attribute__ format so the compiler can flag
incorrect uses. Fix all incorrect uses. Most of these are innocuous,
a few were resulting in crashes.
Modified:
lldb/trunk/include/lldb/API/SBCommandReturnObject.h
lldb/trunk/include/lldb/API/SBError.h
lldb/trunk/include/lldb/API/SBStream.h
lldb/trunk/include/lldb/Core/Error.h
lldb/trunk/include/lldb/Core/Log.h
lldb/trunk/include/lldb/Core/Stream.h
lldb/trunk/include/lldb/Core/Timer.h
lldb/trunk/include/lldb/Host/File.h
lldb/trunk/include/lldb/Host/Host.h
lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
lldb/trunk/source/API/SBData.cpp
lldb/trunk/source/API/SBProcess.cpp
lldb/trunk/source/API/SBTarget.cpp
lldb/trunk/source/API/SBThread.cpp
lldb/trunk/source/API/SBValue.cpp
lldb/trunk/source/Breakpoint/BreakpointList.cpp
lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp
lldb/trunk/source/Breakpoint/BreakpointSiteList.cpp
lldb/trunk/source/Breakpoint/WatchpointLocationList.cpp
lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
lldb/trunk/source/Commands/CommandObjectMemory.cpp
lldb/trunk/source/Commands/CommandObjectProcess.cpp
lldb/trunk/source/Commands/CommandObjectSource.cpp
lldb/trunk/source/Commands/CommandObjectThread.cpp
lldb/trunk/source/Commands/CommandObjectType.cpp
lldb/trunk/source/Core/Address.cpp
lldb/trunk/source/Core/AddressRange.cpp
lldb/trunk/source/Core/DataExtractor.cpp
lldb/trunk/source/Core/Debugger.cpp
lldb/trunk/source/Core/Log.cpp
lldb/trunk/source/Core/Module.cpp
lldb/trunk/source/Core/UserSettingsController.cpp
lldb/trunk/source/Expression/ClangFunction.cpp
lldb/trunk/source/Expression/ClangUserExpression.cpp
lldb/trunk/source/Expression/ClangUtilityFunction.cpp
lldb/trunk/source/Expression/DWARFExpression.cpp
lldb/trunk/source/Expression/IRForTarget.cpp
lldb/trunk/source/Interpreter/CommandObject.cpp
lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
lldb/trunk/source/Symbol/Block.cpp
lldb/trunk/source/Symbol/CompileUnit.cpp
lldb/trunk/source/Symbol/Function.cpp
lldb/trunk/source/Symbol/SymbolContext.cpp
lldb/trunk/source/Symbol/SymbolVendor.cpp
lldb/trunk/source/Symbol/Symtab.cpp
lldb/trunk/source/Symbol/Type.cpp
lldb/trunk/source/Symbol/UnwindPlan.cpp
lldb/trunk/source/Symbol/Variable.cpp
lldb/trunk/source/Target/Process.cpp
lldb/trunk/source/Target/StackFrameList.cpp
lldb/trunk/source/Target/Thread.cpp
lldb/trunk/source/Target/ThreadPlanStepUntil.cpp
lldb/trunk/source/Target/ThreadSpec.cpp
Modified: lldb/trunk/include/lldb/API/SBCommandReturnObject.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBCommandReturnObject.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBCommandReturnObject.h (original)
+++ lldb/trunk/include/lldb/API/SBCommandReturnObject.h Tue Sep 20 16:44:10 2011
@@ -87,7 +87,7 @@
PutCString(const char* string, int len = -1);
size_t
- Printf(const char* format, ...);
+ Printf(const char* format, ...) __attribute__ ((format (printf, 2, 3)));
protected:
friend class SBCommandInterpreter;
Modified: lldb/trunk/include/lldb/API/SBError.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBError.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBError.h (original)
+++ lldb/trunk/include/lldb/API/SBError.h Tue Sep 20 16:44:10 2011
@@ -60,7 +60,7 @@
SetErrorString (const char *err_str);
int
- SetErrorStringWithFormat (const char *format, ...);
+ SetErrorStringWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
bool
IsValid () const;
Modified: lldb/trunk/include/lldb/API/SBStream.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBStream.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBStream.h (original)
+++ lldb/trunk/include/lldb/API/SBStream.h Tue Sep 20 16:44:10 2011
@@ -39,7 +39,7 @@
GetSize();
void
- Printf (const char *format, ...);
+ Printf (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
void
RedirectToFile (const char *path, bool append);
Modified: lldb/trunk/include/lldb/Core/Error.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Error.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Error.h (original)
+++ lldb/trunk/include/lldb/Core/Error.h Tue Sep 20 16:44:10 2011
@@ -175,7 +175,7 @@
/// format string \a format.
//------------------------------------------------------------------
void
- PutToLog (Log *log, const char *format, ...);
+ PutToLog (Log *log, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
//------------------------------------------------------------------
/// Log an error to Log() if the error value is an error.
@@ -196,7 +196,7 @@
/// format string \a format.
//------------------------------------------------------------------
void
- LogIfError (Log *log, const char *format, ...);
+ LogIfError (Log *log, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
//------------------------------------------------------------------
/// Set accessor from a kern_return_t.
Modified: lldb/trunk/include/lldb/Core/Log.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Log.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Log.h (original)
+++ lldb/trunk/include/lldb/Core/Log.h Tue Sep 20 16:44:10 2011
@@ -126,37 +126,37 @@
PutCString (const char *cstr);
void
- Printf (const char *format, ...);
+ Printf (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
void
VAPrintf (const char *format, va_list args);
void
- PrintfWithFlags( uint32_t flags, const char *format, ...);
+ PrintfWithFlags( uint32_t flags, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
void
- LogIf (uint32_t mask, const char *fmt, ...);
+ LogIf (uint32_t mask, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
void
- Debug (const char *fmt, ...);
+ Debug (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
void
- DebugVerbose (const char *fmt, ...);
+ DebugVerbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
void
- Error (const char *fmt, ...);
+ Error (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
void
- FatalError (int err, const char *fmt, ...);
+ FatalError (int err, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
void
- Verbose (const char *fmt, ...);
+ Verbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
void
- Warning (const char *fmt, ...);
+ Warning (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
void
- WarningVerbose (const char *fmt, ...);
+ WarningVerbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
Flags &
GetOptions();
Modified: lldb/trunk/include/lldb/Core/Stream.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Stream.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Stream.h (original)
+++ lldb/trunk/include/lldb/Core/Stream.h Tue Sep 20 16:44:10 2011
@@ -126,7 +126,7 @@
/// The number of bytes that were appended to the stream.
//------------------------------------------------------------------
int
- PrintfAsRawHex8 (const char *format, ...);
+ PrintfAsRawHex8 (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
//------------------------------------------------------------------
/// Format a C string from a printf style format and variable
@@ -519,7 +519,7 @@
/// format string \a format.
//------------------------------------------------------------------
int
- Printf (const char *format, ...);
+ Printf (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
int
PrintfVarArg(const char *format, va_list args);
Modified: lldb/trunk/include/lldb/Core/Timer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Timer.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Timer.h (original)
+++ lldb/trunk/include/lldb/Core/Timer.h Tue Sep 20 16:44:10 2011
@@ -39,7 +39,7 @@
//--------------------------------------------------------------
/// Default constructor.
//--------------------------------------------------------------
- Timer(const char *category, const char *format, ...);
+ Timer(const char *category, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
//--------------------------------------------------------------
/// Desstructor
Modified: lldb/trunk/include/lldb/Host/File.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/File.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/File.h (original)
+++ lldb/trunk/include/lldb/Host/File.h Tue Sep 20 16:44:10 2011
@@ -422,7 +422,7 @@
/// format string \a format.
//------------------------------------------------------------------
int
- Printf (const char *format, ...);
+ Printf (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
int
PrintfVarArg(const char *format, va_list args);
Modified: lldb/trunk/include/lldb/Host/Host.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Host.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/Host.h (original)
+++ lldb/trunk/include/lldb/Host/Host.h Tue Sep 20 16:44:10 2011
@@ -337,7 +337,7 @@
/// description string.
//------------------------------------------------------------------
static void
- SetCrashDescriptionWithFormat (const char *format, ...);
+ SetCrashDescriptionWithFormat (const char *format, ...) __attribute__ ((format (printf, 1, 2)));
static void
SetCrashDescription (const char *description);
Modified: lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h Tue Sep 20 16:44:10 2011
@@ -121,7 +121,7 @@
AppendMessage (const char *in_string, int len = -1);
void
- AppendMessageWithFormat (const char *format, ...);
+ AppendMessageWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
void
AppendRawWarning (const char *in_string, int len = -1);
@@ -130,7 +130,7 @@
AppendWarning (const char *in_string, int len = -1);
void
- AppendWarningWithFormat (const char *format, ...);
+ AppendWarningWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
void
AppendError (const char *in_string, int len = -1);
@@ -139,7 +139,7 @@
AppendRawError (const char *in_string, int len = -1);
void
- AppendErrorWithFormat (const char *format, ...);
+ AppendErrorWithFormat (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
lldb::ReturnStatus
GetStatus();
Modified: lldb/trunk/source/API/SBData.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBData.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/API/SBData.cpp (original)
+++ lldb/trunk/source/API/SBData.cpp Tue Sep 20 16:44:10 2011
@@ -108,7 +108,7 @@
value = m_opaque_sp->GetByteSize();
if (log)
log->Printf ("SBData::GetByteSize () => "
- "(%i)", value);
+ "(%lu)", value);
return value;
}
@@ -187,7 +187,7 @@
}
if (log)
log->Printf ("SBData::GetLongDouble (error=%p,offset=%d) => "
- "(%lf)", error.get(), offset, value);
+ "(%Lf)", error.get(), offset, value);
return value;
}
@@ -297,7 +297,7 @@
}
if (log)
log->Printf ("SBData::GetUnsignedInt64 (error=%p,offset=%d) => "
- "(%q)", error.get(), offset, value);
+ "(%lld)", error.get(), offset, value);
return value;
}
@@ -385,7 +385,7 @@
}
if (log)
log->Printf ("SBData::GetSignedInt64 (error=%p,offset=%d) => "
- "(%q)", error.get(), offset, value);
+ "(%lld)", error.get(), offset, value);
return value;
}
@@ -453,7 +453,7 @@
error.SetErrorString("unable to read data");
}
if (log)
- log->Printf ("SBData::ReadRawData (error=%p,offset=%d,buf=%p,size=%d) => "
+ log->Printf ("SBData::ReadRawData (error=%p,offset=%d,buf=%p,size=%lu) => "
"(%p)", error.get(), offset, buf, size, ok);
return ok ? size : 0;
}
@@ -471,7 +471,7 @@
else
m_opaque_sp->SetData(buf, size, endian);
if (log)
- log->Printf ("SBData::SetData (error=%p,buf=%p,size=%d,endian=%d,addr_size=%c) => "
+ log->Printf ("SBData::SetData (error=%p,buf=%p,size=%lu,endian=%d,addr_size=%c) => "
"(%p)", error.get(), buf, size, endian, addr_size, m_opaque_sp.get());
}
Modified: lldb/trunk/source/API/SBProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBProcess.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/API/SBProcess.cpp (original)
+++ lldb/trunk/source/API/SBProcess.cpp Tue Sep 20 16:44:10 2011
@@ -246,7 +246,7 @@
}
if (log)
- log->Printf ("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %d",
+ log->Printf ("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %lu",
m_opaque_sp.get(),
src,
(uint32_t) src_len,
Modified: lldb/trunk/source/API/SBTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTarget.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/API/SBTarget.cpp (original)
+++ lldb/trunk/source/API/SBTarget.cpp Tue Sep 20 16:44:10 2011
@@ -646,7 +646,7 @@
if (log)
{
- log->Printf ("SBTarget(%p)::BreakpointCreateByAddress (%p, address=%p) => SBBreakpoint(%p)", m_opaque_sp.get(), address, sb_bp.get());
+ log->Printf ("SBTarget(%p)::BreakpointCreateByAddress (address=%llu) => SBBreakpoint(%p)", m_opaque_sp.get(), (uint64_t) address, sb_bp.get());
}
return sb_bp;
Modified: lldb/trunk/source/API/SBThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBThread.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/API/SBThread.cpp (original)
+++ lldb/trunk/source/API/SBThread.cpp Tue Sep 20 16:44:10 2011
@@ -729,7 +729,7 @@
if (all_in_function)
{
step_file_spec.GetPath (path, sizeof(path));
- sb_error.SetErrorStringWithFormat("No line entries for %s:u", path, line);
+ sb_error.SetErrorStringWithFormat("No line entries for %s:%u", path, line);
}
else
sb_error.SetErrorString ("Step until target not in current function.\n");
Modified: lldb/trunk/source/API/SBValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBValue.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/API/SBValue.cpp (original)
+++ lldb/trunk/source/API/SBValue.cpp Tue Sep 20 16:44:10 2011
@@ -106,7 +106,7 @@
if (name)
log->Printf ("SBValue(%p)::GetName () => \"%s\"", m_opaque_sp.get(), name);
else
- log->Printf ("SBValue(%p)::GetName () => NULL", m_opaque_sp.get(), name);
+ log->Printf ("SBValue(%p)::GetName () => NULL", m_opaque_sp.get());
}
return name;
@@ -357,7 +357,7 @@
if (log)
{
if (result.IsValid())
- log->Printf ("SBValue(%p)::GetChildAtOffset => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp.get());
+ log->Printf ("SBValue(%p)::GetChildAtOffset => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp->GetName().AsCString());
else
log->Printf ("SBValue(%p)::GetChildAtOffset => NULL", m_opaque_sp.get());
}
@@ -391,7 +391,7 @@
if (log)
{
if (result.IsValid())
- log->Printf ("SBValue(%p)::GetChildFromExpression => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp.get());
+ log->Printf ("SBValue(%p)::GetChildFromExpression => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp->GetName().AsCString());
else
log->Printf ("SBValue(%p)::GetChildFromExpression => NULL", m_opaque_sp.get());
}
@@ -433,7 +433,7 @@
if (log)
{
if (result.IsValid())
- log->Printf ("SBValue(%p)::GetChildFromAddress => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp.get());
+ log->Printf ("SBValue(%p)::GetChildFromAddress => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp->GetName().AsCString());
else
log->Printf ("SBValue(%p)::GetChildFromAddress => NULL", m_opaque_sp.get());
}
@@ -463,7 +463,7 @@
if (log)
{
if (result.IsValid())
- log->Printf ("SBValue(%p)::GetChildFromExpression => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp.get());
+ log->Printf ("SBValue(%p)::GetChildFromExpression => \"%s\"", m_opaque_sp.get(), result.m_opaque_sp->GetName().AsCString());
else
log->Printf ("SBValue(%p)::GetChildFromExpression => NULL", m_opaque_sp.get());
}
@@ -541,7 +541,7 @@
if (log)
{
if (idx == UINT32_MAX)
- log->Printf ("SBValue(%p)::GetIndexOfChildWithName (name=\"%s\") => NOT FOUND", m_opaque_sp.get(), name, idx);
+ log->Printf ("SBValue(%p)::GetIndexOfChildWithName (name=\"%s\") => NOT FOUND", m_opaque_sp.get(), name);
else
log->Printf ("SBValue(%p)::GetIndexOfChildWithName (name=\"%s\") => %u", m_opaque_sp.get(), name, idx);
}
Modified: lldb/trunk/source/Breakpoint/BreakpointList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointList.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointList.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointList.cpp Tue Sep 20 16:44:10 2011
@@ -154,7 +154,7 @@
BreakpointList::Dump (Stream *s) const
{
Mutex::Locker locker(m_mutex);
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
s->Printf("BreakpointList with %u Breakpoints:\n", (uint32_t)m_breakpoints.size());
s->IndentMore();
Modified: lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp Tue Sep 20 16:44:10 2011
@@ -123,7 +123,7 @@
void
BreakpointLocationList::Dump (Stream *s) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
//s->Indent();
Mutex::Locker locker (m_mutex);
s->Printf("BreakpointLocationList with %zu BreakpointLocations:\n", m_locations.size());
Modified: lldb/trunk/source/Breakpoint/BreakpointSiteList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointSiteList.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/BreakpointSiteList.cpp (original)
+++ lldb/trunk/source/Breakpoint/BreakpointSiteList.cpp Tue Sep 20 16:44:10 2011
@@ -167,7 +167,7 @@
void
BreakpointSiteList::Dump (Stream *s) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
//s->Indent();
s->Printf("BreakpointSiteList with %u BreakpointSites:\n", (uint32_t)m_bp_site_list.size());
s->IndentMore();
Modified: lldb/trunk/source/Breakpoint/WatchpointLocationList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/WatchpointLocationList.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Breakpoint/WatchpointLocationList.cpp (original)
+++ lldb/trunk/source/Breakpoint/WatchpointLocationList.cpp Tue Sep 20 16:44:10 2011
@@ -69,7 +69,7 @@
WatchpointLocationList::DumpWithLevel (Stream *s, lldb::DescriptionLevel description_level) const
{
Mutex::Locker locker (m_mutex);
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
//s->Indent();
s->Printf("WatchpointLocationList with %zu WatchpointLocations:\n",
m_address_to_location.size());
Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp Tue Sep 20 16:44:10 2011
@@ -885,7 +885,7 @@
{
// No breakpoint selected; enable all currently set breakpoints.
target->EnableAllBreakpoints ();
- result.AppendMessageWithFormat ("All breakpoints enabled. (%d breakpoints)\n", num_breakpoints);
+ result.AppendMessageWithFormat ("All breakpoints enabled. (%lu breakpoints)\n", num_breakpoints);
result.SetStatus (eReturnStatusSuccessFinishNoResult);
}
else
@@ -998,7 +998,7 @@
{
// No breakpoint selected; disable all currently set breakpoints.
target->DisableAllBreakpoints ();
- result.AppendMessageWithFormat ("All breakpoints disabled. (%d breakpoints)\n", num_breakpoints);
+ result.AppendMessageWithFormat ("All breakpoints disabled. (%lu breakpoints)\n", num_breakpoints);
result.SetStatus (eReturnStatusSuccessFinishNoResult);
}
else
@@ -1301,7 +1301,7 @@
else
{
target->RemoveAllBreakpoints ();
- result.AppendMessageWithFormat ("All breakpoints removed. (%d breakpoints)\n", num_breakpoints);
+ result.AppendMessageWithFormat ("All breakpoints removed. (%lu breakpoints)\n", num_breakpoints);
}
result.SetStatus (eReturnStatusSuccessFinishNoResult);
}
Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Sep 20 16:44:10 2011
@@ -547,7 +547,7 @@
}
else if (m_memory_options.m_count.OptionWasSet())
{
- result.AppendErrorWithFormat("specify either the end address (0x%llx) or the count (--count %u), not both.\n", end_addr, item_count);
+ result.AppendErrorWithFormat("specify either the end address (0x%llx) or the count (--count %lu), not both.\n", end_addr, item_count);
result.SetStatus(eReturnStatusFailed);
return false;
}
@@ -572,7 +572,7 @@
}
if (bytes_read < total_byte_size)
- result.AppendWarningWithFormat("Not all bytes (%u/%u) were able to be read from 0x%llx.\n", bytes_read, total_byte_size, addr);
+ result.AppendWarningWithFormat("Not all bytes (%lu/%lu) were able to be read from 0x%llx.\n", bytes_read, total_byte_size, addr);
}
StreamFile outfile_stream;
@@ -1012,7 +1012,7 @@
}
else if (!UIntValueIsValidForSize (uval64, item_byte_size))
{
- result.AppendErrorWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, item_byte_size);
+ result.AppendErrorWithFormat ("Value 0x%llx is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
result.SetStatus(eReturnStatusFailed);
return false;
}
@@ -1040,7 +1040,7 @@
}
else if (!UIntValueIsValidForSize (uval64, item_byte_size))
{
- result.AppendErrorWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, item_byte_size);
+ result.AppendErrorWithFormat ("Value 0x%llx is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
result.SetStatus(eReturnStatusFailed);
return false;
}
@@ -1080,7 +1080,7 @@
}
else if (!SIntValueIsValidForSize (sval64, item_byte_size))
{
- result.AppendErrorWithFormat ("Value %lli is too large or small to fit in a %u byte signed integer value.\n", sval64, item_byte_size);
+ result.AppendErrorWithFormat ("Value %lli is too large or small to fit in a %lu byte signed integer value.\n", sval64, item_byte_size);
result.SetStatus(eReturnStatusFailed);
return false;
}
@@ -1097,7 +1097,7 @@
}
else if (!UIntValueIsValidForSize (uval64, item_byte_size))
{
- result.AppendErrorWithFormat ("Value %llu is too large to fit in a %u byte unsigned integer value.\n", uval64, item_byte_size);
+ result.AppendErrorWithFormat ("Value %llu is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
result.SetStatus(eReturnStatusFailed);
return false;
}
@@ -1114,7 +1114,7 @@
}
else if (!UIntValueIsValidForSize (uval64, item_byte_size))
{
- result.AppendErrorWithFormat ("Value %llo is too large to fit in a %u byte unsigned integer value.\n", uval64, item_byte_size);
+ result.AppendErrorWithFormat ("Value %llo is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
result.SetStatus(eReturnStatusFailed);
return false;
}
Modified: lldb/trunk/source/Commands/CommandObjectProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectProcess.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectProcess.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectProcess.cpp Tue Sep 20 16:44:10 2011
@@ -610,7 +610,7 @@
if (command.GetArgumentCount())
{
- result.AppendErrorWithFormat("Invalid arguments for '%s'.\nUsage: \n", m_cmd_name.c_str(), m_cmd_syntax.c_str());
+ result.AppendErrorWithFormat("Invalid arguments for '%s'.\nUsage: %s\n", m_cmd_name.c_str(), m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
}
else
@@ -733,9 +733,7 @@
}
else
{
- result.AppendErrorWithFormat ("No PID specified for attach\n",
- attach_pid,
- error.AsCString());
+ result.AppendErrorWithFormat ("No PID specified for attach\n");
result.SetStatus (eReturnStatusFailed);
}
@@ -1081,15 +1079,14 @@
}
else
{
- result.AppendErrorWithFormat ("Unable to find process plug-in for remote URL '%s'.\nPlease specify a process plug-in name with the --plugin option, or specify an object file using the \"file\" command: \n",
- m_cmd_name.c_str(),
- m_cmd_syntax.c_str());
+ result.AppendErrorWithFormat ("Unable to find process plug-in for remote URL '%s'.\nPlease specify a process plug-in name with the --plugin option, or specify an object file using the \"file\" command.\n",
+ m_cmd_name.c_str());
result.SetStatus (eReturnStatusFailed);
}
}
else
{
- result.AppendErrorWithFormat ("'%s' takes exactly one argument:\nUsage: \n",
+ result.AppendErrorWithFormat ("'%s' takes exactly one argument:\nUsage: %s\n",
m_cmd_name.c_str(),
m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
@@ -1317,7 +1314,7 @@
}
else
{
- result.AppendErrorWithFormat("'%s' takes exactly one signal number argument:\nUsage: \n", m_cmd_name.c_str(),
+ result.AppendErrorWithFormat("'%s' takes exactly one signal number argument:\nUsage: %s\n", m_cmd_name.c_str(),
m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
}
@@ -1380,7 +1377,7 @@
}
else
{
- result.AppendErrorWithFormat("'%s' takes no arguments:\nUsage: \n",
+ result.AppendErrorWithFormat("'%s' takes no arguments:\nUsage: %s\n",
m_cmd_name.c_str(),
m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
@@ -1438,7 +1435,7 @@
}
else
{
- result.AppendErrorWithFormat("'%s' takes no arguments:\nUsage: \n",
+ result.AppendErrorWithFormat("'%s' takes no arguments:\nUsage: %s\n",
m_cmd_name.c_str(),
m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
Modified: lldb/trunk/source/Commands/CommandObjectSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSource.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectSource.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectSource.cpp Tue Sep 20 16:44:10 2011
@@ -389,7 +389,7 @@
sc_list.GetContextAtIndex (i, scratch_sc);
if (scratch_sc.function != NULL)
{
- s.Printf("\n%d: ", i);
+ s.Printf("\n%lu: ", i);
scratch_sc.function->Dump (&s, true);
}
}
Modified: lldb/trunk/source/Commands/CommandObjectThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectThread.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectThread.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectThread.cpp Tue Sep 20 16:44:10 2011
@@ -436,7 +436,7 @@
if (thread == NULL)
{
result.AppendErrorWithFormat ("Thread index %u is out of range (valid values are 0 - %u).\n",
- step_thread_idx, 0, num_threads);
+ step_thread_idx, num_threads);
result.SetStatus (eReturnStatusFailed);
return false;
}
@@ -944,7 +944,6 @@
const uint32_t num_threads = process->GetThreadList().GetSize();
result.AppendErrorWithFormat ("Thread index %u is out of range (valid values are 0 - %u).\n",
m_options.m_thread_idx,
- 0,
num_threads);
result.SetStatus (eReturnStatusFailed);
return false;
@@ -1135,7 +1134,7 @@
}
else if (command.GetArgumentCount() != 1)
{
- result.AppendErrorWithFormat("'%s' takes exactly one thread index argument:\nUsage: \n", m_cmd_name.c_str(), m_cmd_syntax.c_str());
+ result.AppendErrorWithFormat("'%s' takes exactly one thread index argument:\nUsage: %s\n", m_cmd_name.c_str(), m_cmd_syntax.c_str());
result.SetStatus (eReturnStatusFailed);
return false;
}
Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Tue Sep 20 16:44:10 2011
@@ -557,7 +557,7 @@
&error);
if (error.Fail())
{
- out_stream->Printf (error.AsCString());
+ out_stream->Printf ("%s", error.AsCString());
out_stream->Flush();
return;
}
@@ -574,14 +574,14 @@
&error);
if (error.Fail())
{
- out_stream->Printf (error.AsCString());
+ out_stream->Printf ("%s", error.AsCString());
out_stream->Flush();
return;
}
}
else
{
- out_stream->Printf (error.AsCString());
+ out_stream->Printf ("%s", error.AsCString());
out_stream->Flush();
return;
}
Modified: lldb/trunk/source/Core/Address.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Address.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/Address.cpp (original)
+++ lldb/trunk/source/Core/Address.cpp Tue Sep 20 16:44:10 2011
@@ -384,7 +384,7 @@
break;
case DumpStyleSectionPointerOffset:
- s->Printf("(Section *)%.*p + ", (int)sizeof(void*) * 2, m_section);
+ s->Printf("(Section *)%p + ", m_section);
s->Address(m_offset, addr_size);
break;
Modified: lldb/trunk/source/Core/AddressRange.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/AddressRange.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/AddressRange.cpp (original)
+++ lldb/trunk/source/Core/AddressRange.cpp Tue Sep 20 16:44:10 2011
@@ -196,7 +196,7 @@
void
AddressRange::DumpDebug (Stream *s) const
{
- s->Printf("%.*p: AddressRange section = %*p, offset = 0x%16.16llx, byte_size = 0x%16.16llx\n", (int)sizeof(void*) * 2, this, (int)sizeof(void*) * 2, m_base_addr.GetSection(), m_base_addr.GetOffset(), GetByteSize());
+ s->Printf("%p: AddressRange section = %p, offset = 0x%16.16llx, byte_size = 0x%16.16llx\n", this, m_base_addr.GetSection(), m_base_addr.GetOffset(), GetByteSize());
}
//
//bool
Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Tue Sep 20 16:44:10 2011
@@ -1414,15 +1414,15 @@
{
switch (ch)
{
- case '\e': s->Printf ("\\e", (uint8_t)ch); break;
- case '\a': s->Printf ("\\a", ch); break;
- case '\b': s->Printf ("\\b", ch); break;
- case '\f': s->Printf ("\\f", ch); break;
- case '\n': s->Printf ("\\n", ch); break;
- case '\r': s->Printf ("\\r", ch); break;
- case '\t': s->Printf ("\\t", ch); break;
- case '\v': s->Printf ("\\v", ch); break;
- case '\0': s->Printf ("\\0", ch); break;
+ case '\e': s->Printf ("\\e"); break;
+ case '\a': s->Printf ("\\a"); break;
+ case '\b': s->Printf ("\\b"); break;
+ case '\f': s->Printf ("\\f"); break;
+ case '\n': s->Printf ("\\n"); break;
+ case '\r': s->Printf ("\\r"); break;
+ case '\t': s->Printf ("\\t"); break;
+ case '\v': s->Printf ("\\v"); break;
+ case '\0': s->Printf ("\\0"); break;
default:
if (item_byte_size == 1)
s->Printf ("\\x%2.2x", ch);
@@ -1492,15 +1492,15 @@
{
switch (ch)
{
- case '\e': s->Printf ("\\e", (uint8_t)ch); break;
- case '\a': s->Printf ("\\a", ch); break;
- case '\b': s->Printf ("\\b", ch); break;
- case '\f': s->Printf ("\\f", ch); break;
- case '\n': s->Printf ("\\n", ch); break;
- case '\r': s->Printf ("\\r", ch); break;
- case '\t': s->Printf ("\\t", ch); break;
- case '\v': s->Printf ("\\v", ch); break;
- case '\0': s->Printf ("\\0", ch); break;
+ case '\e': s->Printf ("\\e"); break;
+ case '\a': s->Printf ("\\a"); break;
+ case '\b': s->Printf ("\\b"); break;
+ case '\f': s->Printf ("\\f"); break;
+ case '\n': s->Printf ("\\n"); break;
+ case '\r': s->Printf ("\\r"); break;
+ case '\t': s->Printf ("\\t"); break;
+ case '\v': s->Printf ("\\v"); break;
+ case '\0': s->Printf ("\\0"); break;
default: s->Printf ("\\x%2.2x", ch); break;
}
}
@@ -1521,7 +1521,7 @@
s->Printf("\"%s\"", cstr);
else
{
- s->Printf("NULL", cstr);
+ s->Printf("NULL");
offset = UINT32_MAX;
}
}
Modified: lldb/trunk/source/Core/Debugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Tue Sep 20 16:44:10 2011
@@ -790,7 +790,7 @@
*index_lower = ::strtoul (*open_bracket_position+1, &end, 0);
*index_higher = *index_lower;
if (log)
- log->Printf("[%d] detected, high index is same", *index_lower);
+ log->Printf("[%lld] detected, high index is same", *index_lower);
}
else if (*close_bracket_position && *close_bracket_position < var_name_end)
{
@@ -798,7 +798,7 @@
*index_lower = ::strtoul (*open_bracket_position+1, &end, 0);
*index_higher = ::strtoul (*separator_position+1, &end, 0);
if (log)
- log->Printf("[%d-%d] detected", *index_lower, *index_higher);
+ log->Printf("[%lld-%lld] detected", *index_lower, *index_higher);
}
else
{
@@ -1267,7 +1267,7 @@
if (!item)
{
if (log)
- log->Printf("ERROR in getting child item at index %d", index_lower);
+ log->Printf("ERROR in getting child item at index %lld", index_lower);
}
else
{
Modified: lldb/trunk/source/Core/Log.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Log.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/Log.cpp (original)
+++ lldb/trunk/source/Core/Log.cpp Tue Sep 20 16:44:10 2011
@@ -100,7 +100,7 @@
if (m_options.Test (LLDB_LOG_OPTION_PREPEND_TIMESTAMP))
{
struct timeval tv = TimeValue::Now().GetAsTimeVal();
- header.Printf ("%9llu.%6.6llu ", tv.tv_sec, tv.tv_usec);
+ header.Printf ("%9ld.%6.6d ", tv.tv_sec, tv.tv_usec);
}
// Add the process and thread if requested
Modified: lldb/trunk/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/Module.cpp (original)
+++ lldb/trunk/source/Core/Module.cpp Tue Sep 20 16:44:10 2011
@@ -217,7 +217,7 @@
void
Module::DumpSymbolContext(Stream *s)
{
- s->Printf(", Module{0x%8.8x}", this);
+ s->Printf(", Module{%p}", this);
}
uint32_t
Modified: lldb/trunk/source/Core/UserSettingsController.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Core/UserSettingsController.cpp (original)
+++ lldb/trunk/source/Core/UserSettingsController.cpp Tue Sep 20 16:44:10 2011
@@ -859,9 +859,7 @@
StreamString value_str;
- if (tmp_value.GetSize() == 0)
- value_str.Printf ("");
- else if (tmp_value.GetSize() == 1)
+ if (tmp_value.GetSize() == 1)
value_str.Printf ("%s", tmp_value.GetStringAtIndex (0));
else
{
Modified: lldb/trunk/source/Expression/ClangFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangFunction.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangFunction.cpp (original)
+++ lldb/trunk/source/Expression/ClangFunction.cpp Tue Sep 20 16:44:10 2011
@@ -176,7 +176,7 @@
}
else
{
- errors.Printf("Could not determine type of input value %d.", i);
+ errors.Printf("Could not determine type of input value %lu.", i);
return 1;
}
}
@@ -335,7 +335,7 @@
size_t num_args = arg_values.GetSize();
if (num_args != m_arg_values.GetSize())
{
- errors.Printf ("Wrong number of arguments - was: %d should be: %d", num_args, m_arg_values.GetSize());
+ errors.Printf ("Wrong number of arguments - was: %lu should be: %lu", num_args, m_arg_values.GetSize());
return false;
}
Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Tue Sep 20 16:44:10 2011
@@ -319,7 +319,7 @@
if (error_cstr && error_cstr[0])
error_stream.Printf ("error: %s\n", error_cstr);
else
- error_stream.Printf ("error: expression can't be interpreted or run\n", num_errors);
+ error_stream.Printf ("error: expression can't be interpreted or run\n");
return false;
}
}
@@ -550,7 +550,7 @@
if (error_desc)
error_stream.Printf ("Execution was interrupted, reason: %s.", error_desc);
else
- error_stream.Printf ("Execution was interrupted.", error_desc);
+ error_stream.Printf ("Execution was interrupted.");
if (discard_on_error)
error_stream.Printf ("\nThe process has been returned to the state before execution.");
Modified: lldb/trunk/source/Expression/ClangUtilityFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUtilityFunction.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUtilityFunction.cpp (original)
+++ lldb/trunk/source/Expression/ClangUtilityFunction.cpp Tue Sep 20 16:44:10 2011
@@ -173,7 +173,7 @@
if (error_cstr && error_cstr[0])
error_stream.Printf ("error: %s\n", error_cstr);
else
- error_stream.Printf ("error: expression can't be interpreted or run\n", num_errors);
+ error_stream.Printf ("error: expression can't be interpreted or run\n");
return false;
}
}
Modified: lldb/trunk/source/Expression/DWARFExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/DWARFExpression.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Expression/DWARFExpression.cpp (original)
+++ lldb/trunk/source/Expression/DWARFExpression.cpp Tue Sep 20 16:44:10 2011
@@ -310,8 +310,8 @@
case DW_OP_const4s: s->Printf("DW_OP_const4s(0x%8.8x) ", m_data.GetU32(&offset)); break; // 0x0d 1 4-byte constant
case DW_OP_const8u: s->Printf("DW_OP_const8u(0x%16.16llx) ", m_data.GetU64(&offset)); break; // 0x0e 1 8-byte constant
case DW_OP_const8s: s->Printf("DW_OP_const8s(0x%16.16llx) ", m_data.GetU64(&offset)); break; // 0x0f 1 8-byte constant
- case DW_OP_constu: s->Printf("DW_OP_constu(0x%x) ", m_data.GetULEB128(&offset)); break; // 0x10 1 ULEB128 constant
- case DW_OP_consts: s->Printf("DW_OP_consts(0x%x) ", m_data.GetSLEB128(&offset)); break; // 0x11 1 SLEB128 constant
+ case DW_OP_constu: s->Printf("DW_OP_constu(0x%llx) ", m_data.GetULEB128(&offset)); break; // 0x10 1 ULEB128 constant
+ case DW_OP_consts: s->Printf("DW_OP_consts(0x%lld) ", m_data.GetSLEB128(&offset)); break; // 0x11 1 SLEB128 constant
case DW_OP_dup: s->PutCString("DW_OP_dup"); break; // 0x12
case DW_OP_drop: s->PutCString("DW_OP_drop"); break; // 0x13
case DW_OP_over: s->PutCString("DW_OP_over"); break; // 0x14
@@ -330,7 +330,7 @@
case DW_OP_or: s->PutCString("DW_OP_or"); break; // 0x21
case DW_OP_plus: s->PutCString("DW_OP_plus"); break; // 0x22
case DW_OP_plus_uconst: // 0x23 1 ULEB128 addend
- s->Printf("DW_OP_plus_uconst(0x%x) ", m_data.GetULEB128(&offset));
+ s->Printf("DW_OP_plus_uconst(0x%llx) ", m_data.GetULEB128(&offset));
break;
case DW_OP_shl: s->PutCString("DW_OP_shl"); break; // 0x24
@@ -541,7 +541,7 @@
}
break;
case DW_OP_piece: // 0x93 1 ULEB128 size of piece addressed
- s->Printf("DW_OP_piece(0x%x)", m_data.GetULEB128(&offset));
+ s->Printf("DW_OP_piece(0x%llx)", m_data.GetULEB128(&offset));
break;
case DW_OP_deref_size: // 0x94 1 1-byte size of data retrieved
s->Printf("DW_OP_deref_size(0x%2.2x)", m_data.GetU8(&offset));
@@ -568,7 +568,7 @@
// case DW_OP_lo_user: s->PutCString("DW_OP_lo_user"); break; // 0xe0
// case DW_OP_hi_user: s->PutCString("DW_OP_hi_user"); break; // 0xff
case DW_OP_APPLE_extern:
- s->Printf("DW_OP_APPLE_extern(%u)", m_data.GetULEB128(&offset));
+ s->Printf("DW_OP_APPLE_extern(%llu)", m_data.GetULEB128(&offset));
break;
case DW_OP_APPLE_array_ref:
s->PutCString("DW_OP_APPLE_array_ref");
@@ -589,7 +589,7 @@
s->PutCString("DW_OP_APPLE_deref_type");
break;
case DW_OP_APPLE_expr_local: // 0xF5 - ULEB128 expression local index
- s->Printf("DW_OP_APPLE_expr_local(%u)", m_data.GetULEB128(&offset));
+ s->Printf("DW_OP_APPLE_expr_local(%llu)", m_data.GetULEB128(&offset));
break;
case DW_OP_APPLE_constf: // 0xF6 - 1 byte float size, followed by constant float data
{
@@ -1029,7 +1029,7 @@
if (log)
{
size_t count = stack.size();
- log->Printf("Stack before operation has %d values:", count);
+ log->Printf("Stack before operation has %lu values:", count);
for (size_t i=0; i<count; ++i)
{
StreamString new_value;
@@ -2856,7 +2856,7 @@
else if (log)
{
size_t count = stack.size();
- log->Printf("Stack after operation has %d values:", count);
+ log->Printf("Stack after operation has %lu values:", count);
for (size_t i=0; i<count; ++i)
{
StreamString new_value;
Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Tue Sep 20 16:44:10 2011
@@ -1465,7 +1465,7 @@
off_t value_alignment = (ast_context->getTypeAlign(qual_type) + 7) / 8;
if (log)
- log->Printf("Type of \"%s\" is [clang \"%s\", llvm \"%s\"] [size %d, align %d]",
+ log->Printf("Type of \"%s\" is [clang \"%s\", llvm \"%s\"] [size %lu, align %lld]",
name.c_str(),
qual_type.getAsString().c_str(),
PrintType(value_type).c_str(),
@@ -1815,7 +1815,7 @@
}
ss.flush();
- log->Printf("Found ConstantFP with size %d and raw data %s", operand_data_size, s.c_str());
+ log->Printf("Found ConstantFP with size %lu and raw data %s", operand_data_size, s.c_str());
}
lldb_private::DataBufferHeap data(operand_data_size, 0);
@@ -2186,7 +2186,7 @@
}
if (log)
- log->Printf(" \"%s\" [\"%s\"] (\"%s\") placed at %d",
+ log->Printf(" \"%s\" [\"%s\"] (\"%s\") placed at %lld",
value->getName().str().c_str(),
name.GetCString(),
PrintValue(value, true).c_str(),
@@ -2225,7 +2225,7 @@
}
if (log)
- log->Printf("Total structure [align %d, size %d]", alignment, size);
+ log->Printf("Total structure [align %lld, size %lu]", alignment, size);
return true;
}
Modified: lldb/trunk/source/Interpreter/CommandObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandObject.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandObject.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandObject.cpp Tue Sep 20 16:44:10 2011
@@ -600,7 +600,7 @@
str.Printf ("[<%s>]", names.GetData());
break;
case eArgRepeatRange:
- str.Printf ("<%s_1> .. <%s_n>", names.GetData());
+ str.Printf ("<%s_1> .. <%s_n>", names.GetData(), names.GetData());
break;
// Explicitly test for all the rest of the cases, so if new types get added we will notice the
// missing case statement(s).
Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Tue Sep 20 16:44:10 2011
@@ -204,8 +204,7 @@
PyRun_SimpleString (run_string.GetData());
run_string.Clear();
- run_string.Printf ("run_one_line (%s, 'import gnu_libstdcpp')", m_dictionary_name.c_str(),
- interpreter.GetDebugger().GetID());
+ run_string.Printf ("run_one_line (%s, 'import gnu_libstdcpp')", m_dictionary_name.c_str());
PyRun_SimpleString (run_string.GetData());
if (m_dbg_stdout != NULL)
@@ -629,7 +628,7 @@
if (script_interpreter->m_embedded_python_pty.GetMasterFileDescriptor() != -1)
{
if (log)
- log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %d", bytes,
+ log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %lu", bytes,
bytes_len);
if (bytes && bytes_len)
{
@@ -643,7 +642,7 @@
else
{
if (log)
- log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %d, Master File Descriptor is bad.",
+ log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %lu, Master File Descriptor is bad.",
bytes,
bytes_len);
reader.SetIsDone (true);
Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Tue Sep 20 16:44:10 2011
@@ -493,7 +493,7 @@
OSKextLoadedKextSummary::collection kext_summaries;
LogSP log(GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER));
if (log)
- log->Printf ("Adding %d modules.\n");
+ log->Printf ("Adding %d modules.\n", count);
Mutex::Locker locker(m_mutex);
Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Tue Sep 20 16:44:10 2011
@@ -686,7 +686,7 @@
DYLDImageInfo::collection image_infos;
LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER));
if (log)
- log->Printf ("Adding %d modules.\n");
+ log->Printf ("Adding %d modules.\n", image_infos_count);
Mutex::Locker locker(m_mutex);
if (m_process->GetStopID() == m_dyld_image_infos_stop_id)
Modified: lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp Tue Sep 20 16:44:10 2011
@@ -359,11 +359,11 @@
void
ObjectContainerBSDArchive::Dump (Stream *s) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
const size_t num_archs = GetNumArchitectures();
const size_t num_objects = GetNumObjects();
- s->Printf("ObjectContainerBSDArchive, num_archs = %u, num_objects = %u", num_archs, num_objects);
+ s->Printf("ObjectContainerBSDArchive, num_archs = %lu, num_objects = %lu", num_archs, num_objects);
uint32_t i;
ArchSpec arch;
s->IndentMore();
@@ -371,12 +371,12 @@
{
s->Indent();
GetArchitectureAtIndex(i, arch);
- s->Printf("arch[%u] = %s\n", arch.GetArchitectureName());
+ s->Printf("arch[%u] = %s\n", i, arch.GetArchitectureName());
}
for (i=0; i<num_objects; i++)
{
s->Indent();
- s->Printf("object[%u] = %s\n", GetObjectNameAtIndex (i));
+ s->Printf("object[%u] = %s\n", i, GetObjectNameAtIndex (i));
}
s->IndentLess();
s->EOL();
Modified: lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp Tue Sep 20 16:44:10 2011
@@ -156,11 +156,11 @@
void
ObjectContainerUniversalMachO::Dump (Stream *s) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
const size_t num_archs = GetNumArchitectures();
const size_t num_objects = GetNumObjects();
- s->Printf("ObjectContainerUniversalMachO, num_archs = %u, num_objects = %u", num_archs, num_objects);
+ s->Printf("ObjectContainerUniversalMachO, num_archs = %lu, num_objects = %lu", num_archs, num_objects);
uint32_t i;
ArchSpec arch;
s->IndentMore();
@@ -168,12 +168,12 @@
{
s->Indent();
GetArchitectureAtIndex(i, arch);
- s->Printf("arch[%u] = %s\n", arch.GetArchitectureName());
+ s->Printf("arch[%u] = %s\n", i, arch.GetArchitectureName());
}
for (i=0; i<num_objects; i++)
{
s->Indent();
- s->Printf("object[%u] = %s\n", GetObjectNameAtIndex (i));
+ s->Printf("object[%u] = %s\n", i, GetObjectNameAtIndex (i));
}
s->IndentLess();
s->EOL();
Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Tue Sep 20 16:44:10 2011
@@ -1161,9 +1161,9 @@
DumpELFHeader_e_type(s, header.e_type);
s->Printf("\ne_machine = 0x%4.4x\n", header.e_machine);
s->Printf("e_version = 0x%8.8x\n", header.e_version);
- s->Printf("e_entry = 0x%8.8lx\n", header.e_entry);
- s->Printf("e_phoff = 0x%8.8lx\n", header.e_phoff);
- s->Printf("e_shoff = 0x%8.8lx\n", header.e_shoff);
+ s->Printf("e_entry = 0x%8.8llx\n", header.e_entry);
+ s->Printf("e_phoff = 0x%8.8llx\n", header.e_phoff);
+ s->Printf("e_shoff = 0x%8.8llx\n", header.e_shoff);
s->Printf("e_flags = 0x%8.8x\n", header.e_flags);
s->Printf("e_ehsize = 0x%4.4x\n", header.e_ehsize);
s->Printf("e_phentsize = 0x%4.4x\n", header.e_phentsize);
@@ -1221,11 +1221,11 @@
ObjectFileELF::DumpELFProgramHeader(Stream *s, const ELFProgramHeader &ph)
{
DumpELFProgramHeader_p_type(s, ph.p_type);
- s->Printf(" %8.8lx %8.8lx %8.8lx", ph.p_offset, ph.p_vaddr, ph.p_paddr);
- s->Printf(" %8.8lx %8.8lx %8.8lx (", ph.p_filesz, ph.p_memsz, ph.p_flags);
+ s->Printf(" %8.8llx %8.8llx %8.8llx", ph.p_offset, ph.p_vaddr, ph.p_paddr);
+ s->Printf(" %8.8llx %8.8llx %8.8x (", ph.p_filesz, ph.p_memsz, ph.p_flags);
DumpELFProgramHeader_p_flags(s, ph.p_flags);
- s->Printf(") %8.8x", ph.p_align);
+ s->Printf(") %8.8llx", ph.p_align);
}
//----------------------------------------------------------------------
@@ -1306,11 +1306,11 @@
{
s->Printf("%8.8x ", sh.sh_name);
DumpELFSectionHeader_sh_type(s, sh.sh_type);
- s->Printf(" %8.8lx (", sh.sh_flags);
+ s->Printf(" %8.8llx (", sh.sh_flags);
DumpELFSectionHeader_sh_flags(s, sh.sh_flags);
- s->Printf(") %8.8lx %8.8lx %8.8lx", sh.sh_addr, sh.sh_offset, sh.sh_size);
+ s->Printf(") %8.8llx %8.8llx %8.8llx", sh.sh_addr, sh.sh_offset, sh.sh_size);
s->Printf(" %8.8x %8.8x", sh.sh_link, sh.sh_info);
- s->Printf(" %8.8lx %8.8lx", sh.sh_addralign, sh.sh_entsize);
+ s->Printf(" %8.8llx %8.8llx", sh.sh_addralign, sh.sh_entsize);
}
//----------------------------------------------------------------------
Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Tue Sep 20 16:44:10 2011
@@ -1479,7 +1479,7 @@
ObjectFileMachO::Dump (Stream *s)
{
lldb_private::Mutex::Locker locker(m_mutex);
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
if (m_header.magic == HeaderMagic64 || m_header.magic == HeaderMagic64Swapped)
s->PutCString("ObjectFileMachO64");
Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp Tue Sep 20 16:44:10 2011
@@ -656,7 +656,7 @@
ObjectFilePECOFF::Dump(Stream *s)
{
Mutex::Locker locker(m_mutex);
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
s->PutCString("ObjectFilePECOFF");
Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Tue Sep 20 16:44:10 2011
@@ -743,7 +743,7 @@
const addr_t region_addr = packet.GetPointer (&offset);
const uint32_t region_size = packet.GetU32 (&offset);
const uint32_t region_prot = packet.GetU32 (&offset);
- s.Printf("\n\tregion[%i] = { range = [0x%16.16llx - 0x%16.16llx), size = 0x%8.8x, prot = %s }", region_addr, region_addr + region_size, region_size, GetPermissionsAsCString (region_prot));
+ s.Printf("\n\tregion[%llu] = { range = [0x%16.16llx - 0x%16.16llx), size = 0x%8.8x, prot = %s }", region_addr, region_addr, region_addr + region_size, region_size, GetPermissionsAsCString (region_prot));
}
}
break;
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Tue Sep 20 16:44:10 2011
@@ -391,7 +391,7 @@
{
success = false;
if (log)
- log->Printf ("error: invalid checksum in packet: '%s'\n", (int)(total_length), m_bytes.c_str());
+ log->Printf ("error: invalid checksum in packet: '%s'\n", m_bytes.c_str());
}
}
m_bytes.erase(0, total_length);
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp Tue Sep 20 16:44:10 2011
@@ -245,7 +245,7 @@
else
{
if (log)
- log->Printf("error: failed to send '%*s'", payload_length, payload);
+ log->Printf("error: failed to send '%*s'", (int) payload_length, payload);
}
}
else
@@ -311,13 +311,13 @@
else
{
if (log)
- log->Printf("error: packet mutex taken and send_async == false, not sending packet '%*s'", payload_length, payload);
+ log->Printf("error: packet mutex taken and send_async == false, not sending packet '%*s'", (int) payload_length, payload);
}
}
if (response_len == 0)
{
if (log)
- log->Printf("error: failed to get response for '%*s'", payload_length, payload);
+ log->Printf("error: failed to get response for '%*s'", (int) payload_length, payload);
}
return response_len;
}
@@ -385,7 +385,7 @@
got_stdout = false;
if (log)
- log->Printf ("GDBRemoteCommunicationClient::%s () WaitForPacket(%.*s)", __FUNCTION__);
+ log->Printf ("GDBRemoteCommunicationClient::%s () WaitForPacket(%s)", __FUNCTION__, continue_packet.c_str());
if (WaitForPacketWithTimeoutMicroSeconds (response, UINT32_MAX))
{
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Tue Sep 20 16:44:10 2011
@@ -1737,7 +1737,7 @@
{
LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS));
if (log)
- log->Printf ("ProcessGDBRemote::%s (&%p[%u]) ...", __FUNCTION__, buf, buf_size);
+ log->Printf ("ProcessGDBRemote::%s (&%p[%lu]) ...", __FUNCTION__, buf, buf_size);
if (bytes_available > buf_size)
{
memcpy(buf, m_stdout_data.c_str(), buf_size);
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp Tue Sep 20 16:44:10 2011
@@ -885,7 +885,7 @@
}
s->Printf("-------- -------- -------- -------------------------------------------\n");
- s->Printf("%7u %8u 100.00% Total for all DIEs\n", total_die_count, total_die_size);
+ s->Printf("%7u %8u 100.00%% Total for all DIEs\n", total_die_count, total_die_size);
float total_category_percentages[kNumTagCategories] =
{
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp Tue Sep 20 16:44:10 2011
@@ -1146,7 +1146,7 @@
if (obj_file)
obj_file_name = obj_file->GetFileSpec().GetFilename().AsCString();
const char *die_name = GetName (dwarf2Data, cu);
- s.Printf ("CU: %s OBJFILE: %s DIE: %s (0x%llx).",
+ s.Printf ("CU: %s OBJFILE: %s DIE: %s (0x%x).",
cu_name ? cu_name : "<UNKNOWN>",
obj_file_name ? obj_file_name : "<UNKNOWN>",
die_name ? die_name : "<NO NAME>",
@@ -1215,7 +1215,7 @@
{
case DW_AT_stmt_list:
if ( verbose ) s.PutCString(" ( ");
- s.Printf( "0x%8.8x", form_value.Unsigned());
+ s.Printf( "0x%8.8llx", form_value.Unsigned());
if ( verbose ) s.PutCString(" )");
break;
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp Tue Sep 20 16:44:10 2011
@@ -274,7 +274,7 @@
{
dw_uleb128_t addr_offset_n = debug_line_data.GetULEB128(&offset);
dw_uleb128_t addr_offset = addr_offset_n * prologue.min_inst_length;
- log->Printf( "0x%8.8x: DW_LNS_advance_pc (0x%llx)", op_offset, addr_offset);
+ log->Printf( "0x%8.8x: DW_LNS_advance_pc (0x%x)", op_offset, addr_offset);
row.address += addr_offset;
}
break;
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp Tue Sep 20 16:44:10 2011
@@ -65,7 +65,7 @@
break;
case DW_MACINFO_start_file:
- s->Printf(" line:%u file index: '%s'\n", (uint32_t)m_line, (uint32_t)m_op2.file_idx);
+ s->Printf(" line:%u file index: '%u'\n", (uint32_t)m_line, (uint32_t)m_op2.file_idx);
break;
case DW_MACINFO_end_file:
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp Tue Sep 20 16:44:10 2011
@@ -437,7 +437,7 @@
if (verbose)
s.PutCString(" => ");
- s.Printf("{0x%8.8x}", (uvalue + (cu ? cu->GetOffset() : 0)));
+ s.Printf("{0x%8.8llx}", (uvalue + (cu ? cu->GetOffset() : 0)));
}
}
Modified: lldb/trunk/source/Symbol/Block.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Block.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Block.cpp (original)
+++ lldb/trunk/source/Symbol/Block.cpp Tue Sep 20 16:44:10 2011
@@ -78,7 +78,7 @@
}
}
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
*s << "Block" << ((const UserID&)*this);
const Block* parent_block = GetParent();
Modified: lldb/trunk/source/Symbol/CompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/CompileUnit.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/CompileUnit.cpp (original)
+++ lldb/trunk/source/Symbol/CompileUnit.cpp Tue Sep 20 16:44:10 2011
@@ -93,7 +93,7 @@
void
CompileUnit::Dump(Stream *s, bool show_context) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
*s << "CompileUnit" << (const UserID&)*this
<< ", language = \"" << (const Language&)*this
Modified: lldb/trunk/source/Symbol/Function.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Function.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Function.cpp (original)
+++ lldb/trunk/source/Symbol/Function.cpp Tue Sep 20 16:44:10 2011
@@ -355,7 +355,7 @@
void
Function::Dump(Stream *s, bool show_context) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
*s << "Function" << (const UserID&)*this;
@@ -363,7 +363,7 @@
if (m_type)
{
- s->Printf(", type = %.*p", (int)sizeof(void*) * 2, m_type);
+ s->Printf(", type = %p", m_type);
}
else if (m_type_uid != LLDB_INVALID_UID)
{
Modified: lldb/trunk/source/Symbol/SymbolContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolContext.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/SymbolContext.cpp (original)
+++ lldb/trunk/source/Symbol/SymbolContext.cpp Tue Sep 20 16:44:10 2011
@@ -749,15 +749,15 @@
s->Printf ("File: %s", path_str);
if (m_type == eLineStartSpecified)
{
- s->Printf (" from line %d", m_start_line);
+ s->Printf (" from line %lu", m_start_line);
if (m_type == eLineEndSpecified)
- s->Printf ("to line %d", m_end_line);
+ s->Printf ("to line %lu", m_end_line);
else
- s->Printf ("to end", m_end_line);
+ s->Printf ("to end");
}
else if (m_type == eLineEndSpecified)
{
- s->Printf (" from start to line %d", m_end_line);
+ s->Printf (" from start to line %ld", m_end_line);
}
s->Printf (".\n");
}
@@ -765,16 +765,16 @@
if (m_type == eLineStartSpecified)
{
s->Indent();
- s->Printf ("From line %d", m_start_line);
+ s->Printf ("From line %lu", m_start_line);
if (m_type == eLineEndSpecified)
- s->Printf ("to line %d", m_end_line);
+ s->Printf ("to line %lu", m_end_line);
else
- s->Printf ("to end", m_end_line);
+ s->Printf ("to end");
s->Printf (".\n");
}
else if (m_type == eLineEndSpecified)
{
- s->Printf ("From start to line %d.\n", m_end_line);
+ s->Printf ("From start to line %ld.\n", m_end_line);
}
if (m_type == eFunctionSpecified)
Modified: lldb/trunk/source/Symbol/SymbolVendor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolVendor.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/SymbolVendor.cpp (original)
+++ lldb/trunk/source/Symbol/SymbolVendor.cpp Tue Sep 20 16:44:10 2011
@@ -279,7 +279,7 @@
Mutex::Locker locker(m_mutex);
bool show_context = false;
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
s->PutCString("SymbolVendor");
if (m_sym_file_ap.get())
Modified: lldb/trunk/source/Symbol/Symtab.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Symtab.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Symtab.cpp (original)
+++ lldb/trunk/source/Symbol/Symtab.cpp Tue Sep 20 16:44:10 2011
@@ -87,7 +87,7 @@
object_name = m_objfile->GetModule()->GetObjectName().GetCString();
if (file_spec)
- s->Printf("Symtab, file = %s/%s%s%s%s, num_symbols = %u",
+ s->Printf("Symtab, file = %s/%s%s%s%s, num_symbols = %lu",
file_spec.GetDirectory().AsCString(),
file_spec.GetFilename().AsCString(),
object_name ? "(" : "",
@@ -95,7 +95,7 @@
object_name ? ")" : "",
m_symbols.size());
else
- s->Printf("Symtab, num_symbols = %u", m_symbols.size());
+ s->Printf("Symtab, num_symbols = %lu", m_symbols.size());
if (!m_symbols.empty())
{
@@ -169,7 +169,7 @@
const size_t num_symbols = GetNumSymbols();
//s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
s->Indent();
- s->Printf("Symtab %u symbol indexes (%u symbols total):\n", indexes.size(), m_symbols.size());
+ s->Printf("Symtab %lu symbol indexes (%lu symbols total):\n", indexes.size(), m_symbols.size());
s->IndentMore();
if (!indexes.empty())
Modified: lldb/trunk/source/Symbol/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Type.cpp (original)
+++ lldb/trunk/source/Symbol/Type.cpp Tue Sep 20 16:44:10 2011
@@ -142,7 +142,7 @@
void
Type::Dump (Stream *s, bool show_context)
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
*s << "Type" << (const UserID&)*this << ' ';
if (m_name)
Modified: lldb/trunk/source/Symbol/UnwindPlan.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/UnwindPlan.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/UnwindPlan.cpp (original)
+++ lldb/trunk/source/Symbol/UnwindPlan.cpp Tue Sep 20 16:44:10 2011
@@ -166,7 +166,7 @@
if (base_addr != LLDB_INVALID_ADDRESS)
s.Printf ("0x%16.16llx: CFA=", base_addr + GetOffset());
else
- s.Printf ("0x%8.8x: CFA=", GetOffset());
+ s.Printf ("0x%8.8llx: CFA=", GetOffset());
if (reg_info)
s.Printf ("%s", reg_info->name);
Modified: lldb/trunk/source/Symbol/Variable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Variable.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Variable.cpp (original)
+++ lldb/trunk/source/Symbol/Variable.cpp Tue Sep 20 16:44:10 2011
@@ -84,7 +84,7 @@
void
Variable::Dump(Stream *s, bool show_context) const
{
- s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
+ s->Printf("%p: ", this);
s->Indent();
*s << "Variable" << (const UserID&)*this;
Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Sep 20 16:44:10 2011
@@ -167,7 +167,7 @@
}
else
{
- s.Printf ("%-10s %.*-7s ",
+ s.Printf ("%-10s %-7d %s ",
platform->GetUserName (m_euid),
(int)m_arch.GetTriple().getArchName().size(),
m_arch.GetTriple().getArchName().data());
@@ -1107,7 +1107,7 @@
else
{
if (log)
- log->Printf("Process::SetPrivateState (%s) state didn't change. Ignoring...", StateAsCString(new_state), StateAsCString(old_state));
+ log->Printf("Process::SetPrivateState (%s) state didn't change. Ignoring...", StateAsCString(new_state));
}
}
@@ -2682,7 +2682,7 @@
}
if (log)
- log->Printf ("Process::ShouldBroadcastEvent (%p) => %s", event_ptr, StateAsCString(state), return_value ? "YES" : "NO");
+ log->Printf ("Process::ShouldBroadcastEvent (%p) => %s - %s", event_ptr, StateAsCString(state), return_value ? "YES" : "NO");
return return_value;
}
@@ -2830,8 +2830,7 @@
__FUNCTION__,
GetID(),
StateAsCString(new_state),
- StateAsCString (GetState ()),
- IsHijackedForEvent(eBroadcastBitStateChanged) ? "hijacked" : "public");
+ StateAsCString (GetState ()));
}
}
}
Modified: lldb/trunk/source/Target/StackFrameList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrameList.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Target/StackFrameList.cpp (original)
+++ lldb/trunk/source/Target/StackFrameList.cpp Tue Sep 20 16:44:10 2011
@@ -266,7 +266,7 @@
frame->DumpUsingSettingsFormat (s);
}
else
- s->Printf("frame #%u", std::distance (begin, pos));
+ s->Printf("frame #%ld", std::distance (begin, pos));
s->EOL();
}
s->EOL();
Modified: lldb/trunk/source/Target/Thread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Target/Thread.cpp (original)
+++ lldb/trunk/source/Target/Thread.cpp Tue Sep 20 16:44:10 2011
@@ -1018,7 +1018,7 @@
if (name && name[0] != '\0')
sstr.Printf ("%s", name);
else if ((GetIndexID() != 0) || (GetID() != 0))
- sstr.Printf ("0x%4.4x", GetIndexID(), GetID());
+ sstr.Printf ("0x%4.4x", GetIndexID());
if (sstr.GetSize() > 0)
Thread::GetSettingsController()->RenameInstanceSettings (GetInstanceName().AsCString(), sstr.GetData());
Modified: lldb/trunk/source/Target/ThreadPlanStepUntil.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepUntil.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepUntil.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepUntil.cpp Tue Sep 20 16:44:10 2011
@@ -147,7 +147,7 @@
s->Printf ("\n\t0x%llx (bp: %d)", (uint64_t) (*pos).first, (*pos).second);
}
}
- s->Printf(" stepped out address is 0x%lx.", (uint64_t) m_return_addr);
+ s->Printf(" stepped out address is 0x%llx.", (uint64_t) m_return_addr);
}
}
Modified: lldb/trunk/source/Target/ThreadSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadSpec.cpp?rev=140185&r1=140184&r2=140185&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadSpec.cpp (original)
+++ lldb/trunk/source/Target/ThreadSpec.cpp Tue Sep 20 16:44:10 2011
@@ -104,7 +104,7 @@
else
{
if (GetTID() != LLDB_INVALID_THREAD_ID)
- s->Printf("tid: 0x%llx ", GetTID());
+ s->Printf("tid: 0x%x ", GetTID());
if (GetIndex() != UINT32_MAX)
s->Printf("index: %d ", GetIndex());
More information about the lldb-commits
mailing list