Merge lp:~ben-hutchings/ensoft-sextant/filter-search into lp:ensoft-sextant

Proposed by Ben Hutchings
Status: Merged
Approved by: Robert
Approved revision: 50
Merged at revision: 33
Proposed branch: lp:~ben-hutchings/ensoft-sextant/filter-search
Merge into: lp:ensoft-sextant
Diff against target: 21 lines (+2/-2)
1 file modified
src/sextant/objdump_parser.py (+2/-2)
To merge this branch: bzr merge lp:~ben-hutchings/ensoft-sextant/filter-search
Reviewer Review Type Date Requested Status
Robert Approve
Review via email: mp+242498@code.launchpad.net

Commit message

Fixed bug which caused extra characters to be stripped from the beginning of symbol names.

Description of the change

Fixed bug which caused extra characters to be stripped from the beginning of symbol names.

To post a comment you must log in.
Revision history for this message
Robert (rjwills) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/sextant/objdump_parser.py'
--- src/sextant/objdump_parser.py 2014-11-18 16:54:17 +0000
+++ src/sextant/objdump_parser.py 2014-11-21 15:20:56 +0000
@@ -216,7 +216,7 @@
216 # IOS builds add a __be_ (big endian) prefix to all functions,216 # IOS builds add a __be_ (big endian) prefix to all functions,
217 # get rid of it if it is there,217 # get rid of it if it is there,
218 if function_identifier.startswith('__be_'):218 if function_identifier.startswith('__be_'):
219 function_identifier = function_identifier.lstrip('__be_')219 function_identifier = function_identifier[len('__be_'):]
220220
221 if '@' in function_identifier:221 if '@' in function_identifier:
222 # Of form <function name>@<other stuff>.222 # Of form <function name>@<other stuff>.
@@ -245,7 +245,7 @@
245 callee_is_ptr = False245 callee_is_ptr = False
246 function_identifier = callee_info.lstrip('<').rstrip('>\n')246 function_identifier = callee_info.lstrip('<').rstrip('>\n')
247 if function_identifier.startswith('__be_'):247 if function_identifier.startswith('__be_'):
248 function_identifier = function_identifier.lstrip('__be_')248 function_identifier = function_identifier[len('__be_'):]
249249
250 if '@' in function_identifier:250 if '@' in function_identifier:
251 callee = function_identifier.split('@')[0]251 callee = function_identifier.split('@')[0]

Subscribers

People subscribed via source and target branches