changeset 931ef19535e0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=931ef19535e0
description:
LibElf: Build the error management code in libelf.
This change makes some minor changes to get the error management code in
libelf to build on Linux and to build it into the library.
diffstat:
ext/libelf/SConscript | 2 ++
ext/libelf/_libelf.h | 1 +
ext/libelf/elf_errmsg.c | 6 +++---
3 files changed, 6 insertions(+), 3 deletions(-)
diffs (40 lines):
diff -r 7a32aa3acd72 -r 931ef19535e0 ext/libelf/SConscript
--- a/ext/libelf/SConscript Sun Jun 12 21:35:03 2011 -0400
+++ b/ext/libelf/SConscript Sun Jun 12 23:51:59 2011 -0700
@@ -40,6 +40,8 @@
ElfFile('elf_cntl.c')
ElfFile('elf_data.c')
ElfFile('elf_end.c')
+ElfFile('elf_errmsg.c')
+ElfFile('elf_errno.c')
ElfFile('elf_fill.c')
ElfFile('elf_flag.c')
ElfFile('elf_getarhdr.c')
diff -r 7a32aa3acd72 -r 931ef19535e0 ext/libelf/_libelf.h
--- a/ext/libelf/_libelf.h Sun Jun 12 21:35:03 2011 -0400
+++ b/ext/libelf/_libelf.h Sun Jun 12 23:51:59 2011 -0700
@@ -30,6 +30,7 @@
#define __LIBELF_H_
#include "elf_queue.h"
+#include "libelf.h"
#ifndef NULL
#define NULL ((void *) 0)
diff -r 7a32aa3acd72 -r 931ef19535e0 ext/libelf/elf_errmsg.c
--- a/ext/libelf/elf_errmsg.c Sun Jun 12 21:35:03 2011 -0400
+++ b/ext/libelf/elf_errmsg.c Sun Jun 12 23:51:59 2011 -0700
@@ -71,10 +71,10 @@
if (error < 0 || error >= ELF_E_NUM)
return _libelf_errors[ELF_E_NUM];
if (oserr) {
- strlcpy(LIBELF_PRIVATE(msg), _libelf_errors[error],
+ strncpy(LIBELF_PRIVATE(msg), _libelf_errors[error],
sizeof(LIBELF_PRIVATE(msg)));
- strlcat(LIBELF_PRIVATE(msg), ": ",
sizeof(LIBELF_PRIVATE(msg)));
- strlcat(LIBELF_PRIVATE(msg), strerror(oserr),
+ strncat(LIBELF_PRIVATE(msg), ": ",
sizeof(LIBELF_PRIVATE(msg)));
+ strncat(LIBELF_PRIVATE(msg), strerror(oserr),
sizeof(LIBELF_PRIVATE(msg)));
return (const char *)&LIBELF_PRIVATE(msg);
}
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
