summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorCharles Longeau <chl@cvs.openbsd.org>2007-10-17 20:10:45 +0000
committerCharles Longeau <chl@cvs.openbsd.org>2007-10-17 20:10:45 +0000
commit6ebd6f0640abbc5048b4975c40fac23ec404930b (patch)
treee364116c961d5cba80890eb55637a78439f78bf8 /usr.sbin
parent4f4368721b2619584d945f74ab23327bad6ac500 (diff)
remove "unused variable" warnings
tested by deraadt@ on a gcc2 arch looks ok ray@ ok deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/acpidump/acpi.c7
-rw-r--r--usr.sbin/pppd/options.c6
-rw-r--r--usr.sbin/syslogd/syslogd.c7
-rw-r--r--usr.sbin/timed/timed/timed.c3
4 files changed, 9 insertions, 14 deletions
diff --git a/usr.sbin/acpidump/acpi.c b/usr.sbin/acpidump/acpi.c
index 390c649c21f..5b3a069c1a0 100644
--- a/usr.sbin/acpidump/acpi.c
+++ b/usr.sbin/acpidump/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.4 2007/02/22 19:09:26 jordan Exp $ */
+/* $OpenBSD: acpi.c,v 1.5 2007/10/17 20:10:44 chl Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: acpi.c,v 1.4 2007/02/22 19:09:26 jordan Exp $
+ * $Id: acpi.c,v 1.5 2007/10/17 20:10:44 chl Exp $
* $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.3 2000/11/08 02:37:00 iwasaki Exp $
*/
#include <sys/types.h>
@@ -62,8 +62,6 @@ acpi_trim_string(char *s, size_t length)
static void
acpi_print_dsdt_definition(void)
{
- int len;
- char *p;
char oemid[6 + 1];
char oemtblid[8 + 1];
@@ -104,7 +102,6 @@ acpi_handle_dsdt(struct ACPIsdt *dsdp)
{
u_int8_t *dp;
u_int8_t *end;
- extern struct aml_environ asl_env;
acpi_print_dsdt(dsdp);
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index d1ac267367c..8dd3d7680e5 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.22 2007/06/04 14:59:45 henning Exp $ */
+/* $OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $ */
/*
* options.c - handles option processing for PPP.
@@ -46,7 +46,7 @@
#if 0
static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: options.c,v 1.22 2007/06/04 14:59:45 henning Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $";
#endif
#endif
@@ -667,7 +667,7 @@ options_from_user()
int
options_for_tty()
{
- char *dev, *path, *p;
+ char *dev, *path;
int ret;
dev = devnam;
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 1de648da7a1..f827adbec7c 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syslogd.c,v 1.99 2007/09/07 20:55:26 bluhm Exp $ */
+/* $OpenBSD: syslogd.c,v 1.100 2007/10/17 20:10:44 chl Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.99 2007/09/07 20:55:26 bluhm Exp $";
+static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.100 2007/10/17 20:10:44 chl Exp $";
#endif
#endif /* not lint */
@@ -202,7 +202,6 @@ int Startup = 1; /* startup flag */
char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */
char *LocalDomain; /* our local domain name */
int InetInuse = 0; /* non-zero if INET sockets are being used */
-int LogPort; /* port number for INET connections */
int Initialized = 0; /* set when we have initialized ourselves */
int MarkInterval = 20 * 60; /* interval between marks in seconds */
@@ -294,7 +293,7 @@ main(int argc, char *argv[])
{
int ch, i, linesize, fd;
struct sockaddr_un fromunix;
- struct sockaddr_in s_in, frominet;
+ struct sockaddr_in frominet;
socklen_t len;
char *p, *line;
char resolve[MAXHOSTNAMELEN];
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 0ab033492e7..3ad40749f22 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timed.c,v 1.26 2007/02/19 22:39:57 jmc Exp $ */
+/* $OpenBSD: timed.c,v 1.27 2007/10/17 20:10:44 chl Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -132,7 +132,6 @@ main(int argc, char **argv)
struct nets *nt;
struct sockaddr_in server;
u_short port;
- int inlen = 8192;
int ch;
struct ifaddrs *ifap, *ifa;