summaryrefslogtreecommitdiff
path: root/src/ldso
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-11-01 23:46:39 -0400
committerRich Felker <dalias@aerifal.cx>2012-11-01 23:46:39 -0400
commita617a8e2adaaac41dd1b662b6646e8392465801c (patch)
treef5adaf552d944be658e4f967c3f55cc2987fe12f /src/ldso
parent3a5aa8e49ce9a98725ceb311bb64f6168fc72d3e (diff)
downloadmusl-a617a8e2adaaac41dd1b662b6646e8392465801c.tar.gz
musl-a617a8e2adaaac41dd1b662b6646e8392465801c.tar.bz2
musl-a617a8e2adaaac41dd1b662b6646e8392465801c.tar.xz
musl-a617a8e2adaaac41dd1b662b6646e8392465801c.zip
fix more unused variable warnings
some of these were coming from stdio functions locking files without unlocking them. I believe it's useful for this to throw a warning, so I added a new macro that's self-documenting that the file will never be unlocked to avoid the warning in the few places where it's wrong.
Diffstat (limited to 'src/ldso')
-rw-r--r--src/ldso/dynlink.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 13bf16a5..25242051 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -435,7 +435,7 @@ static struct dso *load_library(const char *name)
char buf[2*NAME_MAX+2];
const char *pathname;
unsigned char *base, *map;
- size_t dyno, map_len;
+ size_t map_len;
struct dso *p, temp_dso = {0};
int fd;
struct stat st;
@@ -866,7 +866,7 @@ void *__dynlink(int argc, char **argv)
} else {
int fd;
char *ldname = argv[0];
- size_t dyno, l = strlen(ldname);
+ size_t l = strlen(ldname);
if (l >= 3 && !strcmp(ldname+l-3, "ldd")) ldd_mode = 1;
*argv++ = (void *)-1;
if (argv[0] && !strcmp(argv[0], "--")) *argv++ = (void *)-1;
@@ -962,7 +962,6 @@ void *__dynlink(int argc, char **argv)
update_tls_size();
if (tls_cnt) {
- struct dso *p;
void *mem = mmap(0, libc.tls_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
if (mem==MAP_FAILED ||