Module Name: src
Committed By: christos
Date: Sat Oct 19 17:19:30 UTC 2013
Modified Files:
src/libexec/ld.elf_so: rtld.c
src/libexec/lfs_cleanerd: lfs_cleanerd.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.36 -r1.37 src/libexec/lfs_cleanerd/lfs_cleanerd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.169 src/libexec/ld.elf_so/rtld.c:1.170
--- src/libexec/ld.elf_so/rtld.c:1.169 Thu May 9 11:47:34 2013
+++ src/libexec/ld.elf_so/rtld.c Sat Oct 19 13:19:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.169 2013/05/09 15:47:34 skrll Exp $ */
+/* $NetBSD: rtld.c,v 1.170 2013/10/19 17:19:30 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.169 2013/05/09 15:47:34 skrll Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.170 2013/10/19 17:19:30 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1290,6 +1290,7 @@ dladdr(const void *addr, Dl_info *info)
info->dli_saddr = symbol_addr;
best_def = def;
+
/* Exact match? */
if (info->dli_saddr == addr)
break;
@@ -1299,6 +1300,8 @@ dladdr(const void *addr, Dl_info *info)
if (best_def != NULL && ELF_ST_TYPE(best_def->st_info) == STT_FUNC)
info->dli_saddr = (void *)_rtld_function_descriptor_alloc(obj,
best_def, 0);
+#else
+ __USE(best_def);
#endif /* __HAVE_FUNCTION_DESCRIPTORS */
lookup_mutex_exit();
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.36 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.37
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.36 Tue Jun 18 14:18:57 2013
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Sat Oct 19 13:19:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.36 2013/06/18 18:18:57 christos Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.37 2013/10/19 17:19:30 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -1353,7 +1353,9 @@ lfs_cleaner_main(int argc, char **argv)
{
int i, opt, error, r, loopcount, nodetach;
struct timeval tv;
+#ifdef LFS_CLEANER_AS_LIB
sem_t *semaddr = NULL;
+#endif
CLEANERINFO ci;
#ifndef USE_CLIENT_SERVER
char *cp, *pidname;
@@ -1414,13 +1416,11 @@ lfs_cleaner_main(int argc, char **argv)
case 's': /* Small writes */
do_small = 1;
break;
+#ifdef LFS_CLEANER_AS_LIB
case 'S': /* semaphore */
-#ifndef LFS_CLEANER_AS_LIB
- usage();
- /*NOTREACHED*/
-#endif
semaddr = (void*)(uintptr_t)strtoull(optarg,NULL,0);
break;
+#endif
case 't': /* timeout */
segwait_timeout = atoi(optarg);
break;
