From 40d178866c70f038f06314a678ba7fc7b717ab6e Mon Sep 17 00:00:00 2001 From: Yann Rouillard Date: Tue, 30 Apr 2013 01:59:27 +0200 Subject: [PATCH] Fixed a stupid mistake on SYMINFO name (I should change my terminal font) --- elftools/elf/constants.py | 2 +- elftools/elf/descriptions.py | 42 ++++++++++++++++++------------------ scripts/elfdump.py | 4 ++-- test/test_solaris_support.py | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/elftools/elf/constants.py b/elftools/elf/constants.py index e694293..e042ed0 100644 --- a/elftools/elf/constants.py +++ b/elftools/elf/constants.py @@ -48,7 +48,7 @@ class P_FLAGS(object): # symbol info flags for entries # in the .SUNW_syminfo section -class SYMINF0_FLAGS(object): +class SYMINFO_FLAGS(object): """ Flags for the si_flags field of entries in the .SUNW_syminfo section """ diff --git a/elftools/elf/descriptions.py b/elftools/elf/descriptions.py index df8972f..2c32b1f 100644 --- a/elftools/elf/descriptions.py +++ b/elftools/elf/descriptions.py @@ -9,7 +9,7 @@ from .enums import ( ENUM_D_TAG, ENUM_E_VERSION, ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64 ) -from .constants import P_FLAGS, SH_FLAGS, SYMINF0_FLAGS +from .constants import P_FLAGS, SH_FLAGS, SYMINFO_FLAGS from ..common.py3compat import iteritems @@ -87,16 +87,16 @@ def describe_dyn_tag(x): def describe_syminfo_flags(x): s = '' for flag in ( - SYMINF0_FLAGS.SYMINFO_FLG_DIRECT, - SYMINF0_FLAGS.SYMINFO_FLG_DIRECTBIND, - SYMINF0_FLAGS.SYMINFO_FLG_COPY, - SYMINF0_FLAGS.SYMINFO_FLG_LAZYLOAD, - SYMINF0_FLAGS.SYMINFO_FLG_NOEXTDIRECT, - SYMINF0_FLAGS.SYMINFO_FLG_AUXILIARY, - SYMINF0_FLAGS.SYMINFO_FLG_FILTER, - SYMINF0_FLAGS.SYMINFO_FLG_INTERPOSE, - SYMINF0_FLAGS.SYMINFO_FLG_CAP, - SYMINF0_FLAGS.SYMINFO_FLG_DEFERRED): + SYMINFO_FLAGS.SYMINFO_FLG_DIRECT, + SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND, + SYMINFO_FLAGS.SYMINFO_FLG_COPY, + SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD, + SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT, + SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY, + SYMINFO_FLAGS.SYMINFO_FLG_FILTER, + SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE, + SYMINFO_FLAGS.SYMINFO_FLG_CAP, + SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED): s += _DESCR_SYMINFO_FLAGS[flag] if (x & flag) else '' return s @@ -253,16 +253,16 @@ _DESCR_ST_SHNDX = dict( ) _DESCR_SYMINFO_FLAGS = { - SYMINF0_FLAGS.SYMINFO_FLG_DIRECT: 'D', - SYMINF0_FLAGS.SYMINFO_FLG_DIRECTBIND: 'B', - SYMINF0_FLAGS.SYMINFO_FLG_COPY: 'C', - SYMINF0_FLAGS.SYMINFO_FLG_LAZYLOAD: 'L', - SYMINF0_FLAGS.SYMINFO_FLG_NOEXTDIRECT: 'N', - SYMINF0_FLAGS.SYMINFO_FLG_AUXILIARY: 'A', - SYMINF0_FLAGS.SYMINFO_FLG_FILTER: 'F', - SYMINF0_FLAGS.SYMINFO_FLG_INTERPOSE: 'I', - SYMINF0_FLAGS.SYMINFO_FLG_CAP: 'S', - SYMINF0_FLAGS.SYMINFO_FLG_DEFERRED: 'P', + SYMINFO_FLAGS.SYMINFO_FLG_DIRECT: 'D', + SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND: 'B', + SYMINFO_FLAGS.SYMINFO_FLG_COPY: 'C', + SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD: 'L', + SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT: 'N', + SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY: 'A', + SYMINFO_FLAGS.SYMINFO_FLG_FILTER: 'F', + SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE: 'I', + SYMINFO_FLAGS.SYMINFO_FLG_CAP: 'S', + SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED: 'P', } _DESCR_RELOC_TYPE_i386 = dict( diff --git a/scripts/elfdump.py b/scripts/elfdump.py index 853746d..5e7078f 100755 --- a/scripts/elfdump.py +++ b/scripts/elfdump.py @@ -24,7 +24,7 @@ from elftools.common.py3compat import ( from elftools.elf.elffile import ELFFile from elftools.elf.dynamic import DynamicSection, DynamicSegment from elftools.elf.enums import ENUM_D_TAG -from elftools.elf.constants import SYMINF0_FLAGS +from elftools.elf.constants import SYMINFO_FLAGS from elftools.elf.segments import InterpSegment from elftools.elf.sections import SUNWSyminfoTableSection from elftools.elf.relocation import RelocationSection @@ -91,7 +91,7 @@ class Elfdump(object): continue index = '' - if syminfo['si_flags'] & SYMINF0_FLAGS.SYMINFO_FLG_CAP: + if syminfo['si_flags'] & SYMINFO_FLAGS.SYMINFO_FLG_CAP: boundto = '' elif syminfo['si_boundto'] == 0xffff: boundto = '' diff --git a/test/test_solaris_support.py b/test/test_solaris_support.py index 9ad535c..2f48825 100644 --- a/test/test_solaris_support.py +++ b/test/test_solaris_support.py @@ -12,7 +12,7 @@ import os from utils import setup_syspath; setup_syspath() from elftools.elf.elffile import ELFFile -from elftools.elf.constants import SYMINF0_FLAGS +from elftools.elf.constants import SYMINFO_FLAGS class TestSolarisSupport(unittest.TestCase): @@ -31,8 +31,8 @@ class TestSolarisSupport(unittest.TestCase): for symbol in exit_symbols: self.assertEqual(symbol['si_boundto'], 0) self.assertEqual(symbol['si_flags'], - SYMINF0_FLAGS.SYMINFO_FLG_DIRECT | - SYMINF0_FLAGS.SYMINFO_FLG_DIRECTBIND) + SYMINFO_FLAGS.SYMINFO_FLG_DIRECT | + SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND) def test_SUNW_syminfo_section_x86(self): self._test_SUNW_syminfo_section_generic('exe_solaris32_cc.elf') -- 2.30.2