From e2daa382d9dccef7c10e23a274dc49843b497f1d Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 16 Apr 2011 22:22:24 +0200
Subject: [PATCH] talk(1): Raise WARNS to 6 and fix warnings.

---
 usr.bin/talk/Makefile       | 2 --
 usr.bin/talk/ctl.c          | 7 +++----
 usr.bin/talk/ctl_transact.c | 9 ++++-----
 usr.bin/talk/get_addrs.c    | 3 +--
 usr.bin/talk/get_iface.c    | 2 --
 usr.bin/talk/get_names.c    | 3 +--
 usr.bin/talk/init_disp.c    | 3 +--
 usr.bin/talk/invite.c       | 7 +++----
 usr.bin/talk/io.c           | 5 ++---
 usr.bin/talk/look_up.c      | 3 ---
 usr.bin/talk/msgs.c         | 5 ++---
 usr.bin/talk/talk.h         | 7 +++----
 12 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 1aab081dc2..3db5407595 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,12 +1,10 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD: src/usr.bin/talk/Makefile,v 1.7 1999/08/28 01:06:10 peter Exp $
-# $DragonFly: src/usr.bin/talk/Makefile,v 1.3 2007/08/27 16:50:59 pavalos Exp $
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
 LDADD=	-lcurses -ltermcap
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
 	init_disp.c invite.c io.c look_up.c msgs.c talk.c
-WARNS?=	1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 162554dce8..3f667f141f 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -32,7 +32,6 @@
  *
  * @(#)ctl.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/ctl.c,v 1.6 1999/08/28 01:06:10 peter Exp $
- * $DragonFly: src/usr.bin/talk/ctl.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 /*
@@ -45,9 +44,9 @@
 #include <sys/socket.h>
 #include "talk.h"
 
-struct	sockaddr_in daemon_addr = { sizeof(daemon_addr), AF_INET };
-struct	sockaddr_in ctl_addr = { sizeof(ctl_addr), AF_INET };
-struct	sockaddr_in my_addr = { sizeof(my_addr), AF_INET };
+struct	sockaddr_in daemon_addr = { .sin_len = sizeof(daemon_addr), .sin_family = AF_INET };
+struct	sockaddr_in ctl_addr = { .sin_len = sizeof(ctl_addr), .sin_family = AF_INET };
+struct	sockaddr_in my_addr = { .sin_len = sizeof(my_addr), .sin_family = AF_INET };
 
 	/* inet addresses of the two machines */
 struct	in_addr my_machine_addr;
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index ec43699986..b8ef0c55ad 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -32,7 +32,6 @@
  *
  * @(#)ctl_transact.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/ctl_transact.c,v 1.5 1999/08/28 01:06:11 peter Exp $
- * $DragonFly: src/usr.bin/talk/ctl_transact.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 #include <errno.h>
@@ -48,13 +47,13 @@
  * of time
  */
 void
-ctl_transact(struct in_addr target, CTL_MSG msg, int type, CTL_RESPONSE *rp)
+ctl_transact(struct in_addr target, CTL_MSG lmsg, int type, CTL_RESPONSE *rp)
 {
 	fd_set read_mask, ctl_mask;
 	int nready = 0, cc;
 	struct timeval wait;
 
-	msg.type = type;
+	lmsg.type = type;
 	daemon_addr.sin_addr = target;
 	daemon_addr.sin_port = daemon_port;
 	FD_ZERO(&ctl_mask);
@@ -69,10 +68,10 @@ ctl_transact(struct in_addr target, CTL_MSG msg, int type, CTL_RESPONSE *rp)
 		wait.tv_usec = 0;
 		/* resend message until a response is obtained */
 		do {
-			cc = sendto(ctl_sockt, (char *)&msg, sizeof (msg), 0,
+			cc = sendto(ctl_sockt, (char *)&lmsg, sizeof (lmsg), 0,
 			    (struct sockaddr *)&daemon_addr,
 			    sizeof (daemon_addr));
-			if (cc != sizeof (msg)) {
+			if (cc != sizeof (lmsg)) {
 				if (errno == EINTR)
 					continue;
 				p_error("Error on write to talk daemon");
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index eb545bee1b..c1c65cb4e8 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -32,7 +32,6 @@
  *
  * @(#)get_addrs.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/get_addrs.c,v 1.4 1999/08/28 01:06:11 peter Exp $
- * $DragonFly: src/usr.bin/talk/get_addrs.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 #include <err.h>
@@ -42,7 +41,7 @@
 #include "talk_ctl.h"
 
 void
-get_addrs(char *my_machine_name, char *his_machine_name)
+get_addrs(char *my_machine_name __unused, char *his_machine_name)
 {
 	struct hostent *hp;
 	struct servent *sp;
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index b267128739..9a75088eef 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -30,7 +30,6 @@
  *  Id: find_interface.c,v 1.1 1995/08/14 16:08:39 wollman Exp
  *
  * $FreeBSD: src/usr.bin/talk/get_iface.c,v 1.7 1999/08/28 01:06:12 peter Exp $
- * $DragonFly: src/usr.bin/talk/get_iface.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 #include <errno.h>
@@ -47,7 +46,6 @@ get_iface(struct in_addr *dst, struct in_addr *iface)
 {
 	static struct sockaddr_in local;
 	struct sockaddr_in remote;
-	struct hostent *hp;
 	int s, rv, namelen;
 
 	memcpy(&remote.sin_addr, dst, sizeof remote.sin_addr);
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index ed463e96c1..2a178737b3 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -32,7 +32,6 @@
  *
  * @(#)get_names.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/get_names.c,v 1.6.2.1 2001/07/30 10:31:29 dd Exp $
- * $DragonFly: src/usr.bin/talk/get_names.c,v 1.5 2008/10/16 01:52:33 swildner Exp $
  */
 
 #include <err.h>
@@ -60,7 +59,7 @@ get_names(int argc, char **argv)
 	char hostname[MAXHOSTNAMELEN];
 	char *his_name, *my_name;
 	char *my_machine_name, *his_machine_name;
-	char *my_tty, *his_tty;
+	const char *his_tty;
 	char *cp;
 
 	if (argc < 2 )
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 582abfc696..691da8058b 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -32,7 +32,6 @@
  *
  * @(#)init_disp.c	8.2 (Berkeley) 2/16/94
  * $FreeBSD: src/usr.bin/talk/init_disp.c,v 1.11.2.1 2001/07/30 10:31:29 dd Exp $
- * $DragonFly: src/usr.bin/talk/init_disp.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 /*
@@ -151,7 +150,7 @@ set_edit_chars(void)
 
 /* ARGSUSED */
 void
-sig_sent(int signo)
+sig_sent(int signo __unused)
 {
 
 	message("Connection closing. Exiting");
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index d6c8d4bd05..04cb77ee50 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -32,7 +32,6 @@
  *
  * @(#)invite.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/invite.c,v 1.6.2.1 2000/10/05 17:40:38 ru Exp $
- * $DragonFly: src/usr.bin/talk/invite.c,v 1.4 2004/08/19 23:32:02 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +62,7 @@ jmp_buf invitebuf;
 void
 invite_remote(void)
 {
-	int nfd, read_mask, template, new_sockt;
+	int new_sockt;
 	struct itimerval itimer;
 	CTL_RESPONSE response;
 
@@ -118,7 +117,7 @@ invite_remote(void)
  */
 /* ARGSUSED */
 void
-re_invite(int signo)
+re_invite(int signo __unused)
 {
 
 	message("Ringing your party again");
@@ -131,7 +130,7 @@ re_invite(int signo)
 	longjmp(invitebuf, 1);
 }
 
-static	char *answers[] = {
+static	const char *answers[] = {
 	"answer #0",					/* SUCCESS */
 	"Your party is not logged on",			/* NOT_HERE */
 	"Target machine is too confused to talk to us",	/* FAILED */
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index d8d7b8e1e0..9bf4231001 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -32,7 +32,6 @@
  *
  * @(#)io.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/io.c,v 1.9.2.2 2001/10/15 13:42:07 dd Exp $
- * $DragonFly: src/usr.bin/talk/io.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 /*
@@ -140,7 +139,7 @@ talk(void)
  * on the screen and then exits. (i.e. a curses version of perror)
  */
 void
-p_error(char *string)
+p_error(const char *string)
 {
 	wmove(my_win.x_win, current_line, 0);
 	wprintw(my_win.x_win, "[%s : %s (%d)]\n",
@@ -155,7 +154,7 @@ p_error(char *string)
  * Display string in the standard location
  */
 void
-message(char *string)
+message(const char *string)
 {
 	wmove(my_win.x_win, current_line, 0);
 	wprintw(my_win.x_win, "[%s]\n", string);
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index fae780d659..9c46109d15 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -32,7 +32,6 @@
  *
  * @(#)look_up.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/look_up.c,v 1.5 1999/08/28 01:06:14 peter Exp $
- * $DragonFly: src/usr.bin/talk/look_up.c,v 1.5 2008/10/16 01:52:33 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -98,8 +97,6 @@ check_local(void)
 int
 look_for_invite(CTL_RESPONSE *rp)
 {
-	struct in_addr machine_addr;
-
 	current_state = "Checking for invitation on caller's machine";
 	ctl_transact(his_machine_addr, msg, LOOK_UP, rp);
 	/* the switch is for later options, such as multiple invitations */
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index ee9fa5303c..07f1466a40 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -32,7 +32,6 @@
  *
  * @(#)msgs.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/msgs.c,v 1.5 1999/08/28 01:06:14 peter Exp $
- * $DragonFly: src/usr.bin/talk/msgs.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 /*
@@ -45,12 +44,12 @@
 
 #define MSG_INTERVAL 4
 
-char	*current_state;
+const char	*current_state;
 int	current_line = 0;
 
 /* ARGSUSED */
 void
-disp_msg(int signo)
+disp_msg(int signo __unused)
 {
 	message(current_state);
 }
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 82659875f0..3894696050 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)talk.h	8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.bin/talk/talk.h,v 1.4 2004/08/19 23:32:02 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +46,7 @@ extern	int sockt;
 extern	int curses_initialized;
 extern	int invitation_waiting;
 
-extern	char *current_state;
+extern	const char *current_state;
 extern	int current_line;
 
 typedef struct xwin {
@@ -79,10 +78,10 @@ extern	void	init_display(void);
 extern	void	invite_remote(void);
 extern	int	look_for_invite(CTL_RESPONSE *);
 extern	int	max(int, int);
-extern	void	message(char *);
+extern	void	message(const char *);
 extern	void	open_ctl(void);
 extern	void	open_sockt(void);
-extern	void	p_error(char *);
+extern	void	p_error(const char *);
 extern	void	print_addr(struct sockaddr_in);
 extern	void	quit(void);
 extern	int	readwin(WINDOW *, int, int);
-- 
2.41.0