svn commit: trunk/uClibc/ldso/ldso
vapier at uclibc.org
vapier at uclibc.org
Thu Mar 2 03:43:28 UTC 2006
Author: vapier
Date: 2006-03-01 19:43:27 -0800 (Wed, 01 Mar 2006)
New Revision: 14417
Log:
make all the warnings the same and add line #s so we can pick em out at runtime
Modified:
trunk/uClibc/ldso/ldso/dl-elf.c
trunk/uClibc/ldso/ldso/ldso.c
Changeset:
Modified: trunk/uClibc/ldso/ldso/dl-elf.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-elf.c 2006-03-02 03:36:11 UTC (rev 14416)
+++ trunk/uClibc/ldso/ldso/dl-elf.c 2006-03-02 03:43:27 UTC (rev 14417)
@@ -60,8 +60,8 @@
_dl_cache_addr = (caddr_t) _dl_mmap(0, _dl_cache_size, PROT_READ, MAP_SHARED, fd, 0);
_dl_close(fd);
if (_dl_mmap_check_error(_dl_cache_addr)) {
- _dl_dprintf(2, "%s: can't map cache '%s'\n",
- _dl_progname, LDSO_CACHE);
+ _dl_dprintf(2, "%s:%i: can't map '%s'\n",
+ _dl_progname, __LINE__, LDSO_CACHE);
return -1;
}
@@ -371,7 +371,7 @@
header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (_dl_mmap_check_error(header)) {
- _dl_dprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
+ _dl_dprintf(2, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, libname);
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
_dl_close(infile);
return NULL;
@@ -445,7 +445,7 @@
status = (char *) _dl_mmap((char *) (piclib ? 0 : minvma),
maxvma - minvma, PROT_NONE, flags | MAP_ANONYMOUS, -1, 0);
if (_dl_mmap_check_error(status)) {
- _dl_dprintf(2, "%s: can't map %s\n", _dl_progname, libname);
+ _dl_dprintf(2, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, libname);
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
_dl_close(infile);
_dl_munmap(header, _dl_pagesize);
@@ -482,8 +482,8 @@
ppnt->p_offset & OFFS_ALIGN);
if (_dl_mmap_check_error(status)) {
- _dl_dprintf(2, "%s: can't map '%s'\n",
- _dl_progname, libname);
+ _dl_dprintf(2, "%s:%i: can't map '%s'\n",
+ _dl_progname, __LINE__, libname);
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
_dl_munmap((char *) libaddr, maxvma - minvma);
_dl_close(infile);
@@ -516,7 +516,7 @@
ppnt->p_filesz, LXFLAGS(ppnt->p_flags), flags,
infile, ppnt->p_offset & OFFS_ALIGN);
if (_dl_mmap_check_error(status)) {
- _dl_dprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
+ _dl_dprintf(2, "%s:%i: can't map '%s'\n", _dl_progname, __LINE__, libname);
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
_dl_munmap((char *) libaddr, maxvma - minvma);
_dl_close(infile);
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c 2006-03-02 03:36:11 UTC (rev 14416)
+++ trunk/uClibc/ldso/ldso/ldso.c 2006-03-02 03:43:27 UTC (rev 14417)
@@ -536,8 +536,8 @@
PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
_dl_close(fd);
if (preload == (caddr_t) -1) {
- _dl_dprintf(_dl_debug_file, "%s: can't map file '%s'\n",
- _dl_progname, LDSO_PRELOAD);
+ _dl_dprintf(_dl_debug_file, "%s:%i: can't map '%s'\n",
+ _dl_progname, __LINE__, LDSO_PRELOAD);
break;
}
More information about the uClibc-cvs
mailing list