Commit cf010f76 authored by hjk's avatar hjk

debugger: fix the last two commits

parent cc79467d
......@@ -36,7 +36,7 @@ def cleanAddress(addr):
# ~"0xbffff0e7 \"\\001\\b\\361\\377\\277\\\\\\206\\004\\b\"\n"
# we need to remove the trailing rubbish
pos = addr.find(' ')
if pos == -1
if pos == -1:
return addr
return addr[0:pos]
......@@ -394,7 +394,7 @@ class FrameCommand(gdb.Command):
# A "normal" local variable or parameter
d.beginHash()
d.put('iname="%s",' % item.iname)
d.put('addr="%s",' % cleanAddress(item.value.address))
d.put('addr="%s",' % cleanAddress(str(item.value.address)))
d.safePutItemHelper(item)
d.endHash()
......
......@@ -89,7 +89,7 @@ public:
{ parent = 0; }
void setData(const WatchData &data)
{ static_cast<WatchData &>(*this) = data; parent = 0; }
{ static_cast<WatchData &>(*this) = data; }
WatchItem *parent;
QList<WatchItem *> children; // fetched children
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment