From 1a0a232edf4139cec498f5da97edac54cd790966 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Fri, 17 Feb 2023 17:59:36 +0000
Subject: [PATCH] Remove unused variables; ok millert@

---
 lib/libc/db/hash/ndbm.c | 3 +--
 libexec/ftpd/popen.c    | 3 +--
 usr.bin/make/arch.c     | 8 +++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index cc54ccf928a..10bb248afb9 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndbm.c,v 1.27 2021/10/24 10:05:22 jsg Exp $	*/
+/*	$OpenBSD: ndbm.c,v 1.28 2023/02/17 17:59:36 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -47,7 +47,6 @@
  * First are the DBM routines, which call the NDBM routines, and
  * the NDBM routines, which call the DB routines.
  */
-static DBM *__cur_db;
 
 static DBM *_dbm_open(const char *, const char *, int, mode_t);
 
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index ddc15335666..51b55f27dfb 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: popen.c,v 1.30 2020/12/27 15:11:04 florian Exp $	*/
+/*	$OpenBSD: popen.c,v 1.31 2023/02/17 17:59:36 miod Exp $	*/
 /*	$NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $	*/
 
 /*
@@ -61,7 +61,6 @@
 FILE *
 ftpd_ls(const char *path, pid_t *pidptr)
 {
-	char *cp;
 	FILE *iop;
 	int argc = 0, pdes[2];
 	pid_t pid;
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index d25f89b76b6..ef7cdee6234 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arch.c,v 1.92 2022/12/26 19:16:02 jmc Exp $ */
+/*	$OpenBSD: arch.c,v 1.93 2023/02/17 17:59:36 miod Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
@@ -116,10 +116,8 @@ typedef struct Arch_ {
 	char name[1];		/* Archive name. */
 } Arch;
 
-/* Used to get to ar's field sizes.  */
-static struct ar_hdr *dummy;
-#define AR_NAME_SIZE		(sizeof(dummy->ar_name))
-#define AR_DATE_SIZE		(sizeof(dummy->ar_date))
+#define AR_NAME_SIZE		(sizeof(((struct ar_hdr *)0)->ar_name))
+#define AR_DATE_SIZE		(sizeof(((struct ar_hdr *)0)->ar_date))
 
 /* Each archive member is tied to an arch_member structure,
  * suitable for hashing.  */
-- 
2.20.1