summaryrefslogtreecommitdiff
path: root/src/format/elf
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2009-04-25 16:51:41 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2009-04-25 16:51:41 (GMT)
commitb9977e00ff9eb6e025e86a15c858183f3f314cf5 (patch)
treeeedacb236b90228d2b4c603fa9875ecaad05ee29 /src/format/elf
parent216a3d0121fabd678e50ea6b4fa2447ae9b921f0 (diff)
Saved the current work on plugins.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@59 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/format/elf')
-rw-r--r--src/format/elf/Makefile.am8
-rw-r--r--src/format/elf/e_elf.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/format/elf/Makefile.am b/src/format/elf/Makefile.am
index 663194e..c64fc5c 100644
--- a/src/format/elf/Makefile.am
+++ b/src/format/elf/Makefile.am
@@ -1,14 +1,16 @@
-lib_LIBRARIES = libformatelf.a
+lib_LTLIBRARIES = libformatelf.la
-libformatelf_a_SOURCES = \
+libformatelf_la_SOURCES = \
e_elf.h e_elf.c \
elf-int.h \
section.h section.c \
strings.h strings.c \
symbol.h symbol.c
-libformatelf_a_CFLAGS = $(AM_CFLAGS)
+libformatelf_la_LDFLAGS = $(LIBGTK_LIBS) \
+ -L../../common/.libs -common \
+ -L../../arch/.libs -larch
INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/elf/e_elf.c b/src/format/elf/e_elf.c
index 1a1fe8d..c52a304 100644
--- a/src/format/elf/e_elf.c
+++ b/src/format/elf/e_elf.c
@@ -33,6 +33,7 @@
#include "strings.h"
#include "symbol.h"
#include "../../panel/log.h"
+#include "../../common/extstr.h"
@@ -47,9 +48,6 @@ uint64_t get_elf_entry_point(const elf_format *);
-/* S'assure qu'une chaîne de caractère tient sur une ligne. */
-extern char *escape_crlf_bin_string(char *);
-
/* Récupère tous les éléments identifiées dans le binaire. */
size_t get_elf_resolved_items(const elf_format *, char ***, ResolvedType **, uint64_t **);
@@ -462,7 +460,7 @@ size_t get_elf_resolved_items(const elf_format *format, char ***labels, Resolved
(*types)[start + i] = RTP_STRING;
(*offsets)[start + i] = format->strings[i].vaddress;
- (*labels)[start + i] = escape_crlf_bin_string((*labels)[start + i]);
+ (*labels)[start + i] = escape_crlf((*labels)[start + i]);
}