summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Core')
-rw-r--r--lldb/source/Core/Address.cpp2
-rw-r--r--lldb/source/Core/AddressRange.cpp2
-rw-r--r--lldb/source/Core/DataExtractor.cpp38
-rw-r--r--lldb/source/Core/Debugger.cpp6
-rw-r--r--lldb/source/Core/Log.cpp2
-rw-r--r--lldb/source/Core/Module.cpp2
-rw-r--r--lldb/source/Core/UserSettingsController.cpp4
7 files changed, 27 insertions, 29 deletions
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index c07901cc0d9..200ef4cf7c0 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -384,7 +384,7 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
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;
diff --git a/lldb/source/Core/AddressRange.cpp b/lldb/source/Core/AddressRange.cpp
index 42b1b20dda6..391f611dc35 100644
--- a/lldb/source/Core/AddressRange.cpp
+++ b/lldb/source/Core/AddressRange.cpp
@@ -196,7 +196,7 @@ AddressRange::Dump(Stream *s, Target *target, Address::DumpStyle style, Address:
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
diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp
index 2cfced03800..4d5ac71a1b4 100644
--- a/lldb/source/Core/DataExtractor.cpp
+++ b/lldb/source/Core/DataExtractor.cpp
@@ -1414,15 +1414,15 @@ DataExtractor::Dump
{
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 @@ DataExtractor::Dump
{
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 @@ DataExtractor::Dump
s->Printf("\"%s\"", cstr);
else
{
- s->Printf("NULL", cstr);
+ s->Printf("NULL");
offset = UINT32_MAX;
}
}
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index debba813a85..c101038ca89 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -790,7 +790,7 @@ ScanBracketedRange (const char* var_name_begin,
*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 @@ ScanBracketedRange (const char* var_name_begin,
*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 @@ Debugger::FormatPrompt
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
{
diff --git a/lldb/source/Core/Log.cpp b/lldb/source/Core/Log.cpp
index f537f1ea2bc..2809a9323b9 100644
--- a/lldb/source/Core/Log.cpp
+++ b/lldb/source/Core/Log.cpp
@@ -100,7 +100,7 @@ Log::PrintfWithFlagsVarArg (uint32_t flags, const char *format, va_list args)
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
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index d54f9699a49..dc0c55c483a 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -217,7 +217,7 @@ Module::CalculateSymbolContextModule ()
void
Module::DumpSymbolContext(Stream *s)
{
- s->Printf(", Module{0x%8.8x}", this);
+ s->Printf(", Module{%p}", this);
}
uint32_t
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index 404526b663e..332652aa305 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -859,9 +859,7 @@ UserSettingsController::GetAllPendingSettingValues (Stream &strm)
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
{
OpenPOWER on IntegriCloud