diff options
Diffstat (limited to 'miasm2/core')
| -rw-r--r-- | miasm2/core/bin_stream.py | 4 | ||||
| -rw-r--r-- | miasm2/core/utils.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/core/bin_stream.py b/miasm2/core/bin_stream.py index 19614661..6e158061 100644 --- a/miasm2/core/bin_stream.py +++ b/miasm2/core/bin_stream.py @@ -96,9 +96,9 @@ class bin_stream_str(bin_stream): class bin_stream_file(bin_stream): - def __init__(self, bin, offset=0L, shift=0): + def __init__(self, binary, offset=0L, shift=0): bin_stream.__init__(self) - self.bin = bin + self.bin = binary self.bin.seek(0, 2) self.shift = shift self.l = self.bin.tell() diff --git a/miasm2/core/utils.py b/miasm2/core/utils.py index 360deb8d..b2ddff2b 100644 --- a/miasm2/core/utils.py +++ b/miasm2/core/utils.py @@ -27,10 +27,10 @@ def hexdump(src, length=16): lines = [] for c in xrange(0, len(src), length): chars = src[c:c + length] - hex = ' '.join(["%02x" % ord(x) for x in chars]) + hexa = ' '.join(["%02x" % ord(x) for x in chars]) printable = ''.join( ["%s" % ((ord(x) <= 127 and FILTER[ord(x)]) or '.') for x in chars]) - lines.append("%04x %-*s %s\n" % (c, length * 3, hex, printable)) + lines.append("%04x %-*s %s\n" % (c, length * 3, hexa, printable)) print ''.join(lines) # stackoverflow.com/questions/2912231 |