From: Sascha Wildner <saw@online.de>
Date: Fri, 19 Oct 2012 15:47:17 +0000 (+0200)
Subject: Revert a few additions of __unused that need some more thought.
X-Git-Tag: v3.4.0rc~990^2~36
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/312a61c7bfeb5c091ddfe90fce7194047b502c01

Revert a few additions of __unused that need some more thought.

We can postpone it until WARNS gets raised to 4 (at the moment, all
this stuff is WARNS = 2).
---

diff --git a/gnu/lib/libdialog/dir.c b/gnu/lib/libdialog/dir.c
index 56baf289f8..f290bc404a 100644
--- a/gnu/lib/libdialog/dir.c
+++ b/gnu/lib/libdialog/dir.c
@@ -381,7 +381,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
 	struct dirent	**dire;
 	struct stat	status;
 	int		i, j, nb;
-	long		__unused d;
+	long		d;
 
 
 	getcwd(cwd, MAXPATHLEN);
diff --git a/gnu/lib/libdialog/textbox.c b/gnu/lib/libdialog/textbox.c
index 89898add55..f640080d7a 100644
--- a/gnu/lib/libdialog/textbox.c
+++ b/gnu/lib/libdialog/textbox.c
@@ -18,7 +18,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $FreeBSD: src/gnu/lib/libdialog/textbox.c,v 1.18.6.2 2002/06/18 07:59:59 dougb Exp $
- * $DragonFly: src/gnu/lib/libdialog/textbox.c,v 1.2 2003/06/17 04:25:43 dillon Exp $
  */
 
 #include <dialog.h>
@@ -562,7 +561,7 @@ static void print_page(WINDOW *win, int height, int width)
  */
 static void print_line(WINDOW *win, int row, int width)
 {
-  int i, __unused y, x;
+  int i, y, x;
   unsigned char *line;
 
   line = get_line();
diff --git a/lib/libncp/ncpl_rcfile.c b/lib/libncp/ncpl_rcfile.c
index a4295a627a..8cce510f6a 100644
--- a/lib/libncp/ncpl_rcfile.c
+++ b/lib/libncp/ncpl_rcfile.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libncp/ncpl_rcfile.c,v 1.1 1999/10/12 11:56:40 bp Exp $
- * $DragonFly: src/lib/libncp/ncpl_rcfile.c,v 1.2 2003/06/17 04:26:50 dillon Exp $
  */
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -389,7 +388,7 @@ rc_getbool(struct rcfile *rcp,char *section, char *key,int *value) {
 int
 ncp_open_rcfile(void) {
 	char *home, *fn;
-	int __unused error;
+	int error;
 
 	home = getenv("HOME");
 	if (home) {
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 61abff49d6..9df43542ba 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -671,6 +671,7 @@ nfs_readdir(struct open_file *f, struct dirent *d)
 	struct nfs_readdir_off  *roff = NULL;
 	static char *buf;
 	static n_long cookie = 0;
+	size_t cc;
 	n_long eof;
 	
 	struct {
@@ -691,7 +692,7 @@ nfs_readdir(struct open_file *f, struct dirent *d)
 		args->cookie = htonl(cookie);
 		args->count  = htonl(NFS_READDIRSIZE);
 		
-		rpc_call(fp->iodesc, NFS_PROG, NFS_VER2, NFSPROC_READDIR,
+		cc = rpc_call(fp->iodesc, NFS_PROG, NFS_VER2, NFSPROC_READDIR,
 			      args, sizeof(*args),
 			      rdata.d, sizeof(rdata.d));
 		buf  = rdata.d;
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index cb13325faf..eb7851ac9a 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -639,7 +639,7 @@ terminaltypeok(char *s)
 void
 doit(struct sockaddr *who)
 {
-	int __unused err_; /* XXX */
+	int err_; /* XXX */
 	int ptynum;
 
 	/*