From owner-svn-src-head@FreeBSD.ORG  Sun Nov  6 08:17:24 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B2E71066919;
	Sun,  6 Nov 2011 08:17:24 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D6858FC1B;
	Sun,  6 Nov 2011 08:17:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68HOsO009194;
	Sun, 6 Nov 2011 08:17:24 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68HNX7009189;
	Sun, 6 Nov 2011 08:17:23 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201111060817.pA68HNX7009189@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 6 Nov 2011 08:17:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227185 - head/usr.bin/talk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 08:17:24 -0000

Author: ed
Date: Sun Nov  6 08:17:23 2011
New Revision: 227185
URL: http://svn.freebsd.org/changeset/base/227185

Log:
  Add missing static keywords to talk(1)

Modified:
  head/usr.bin/talk/ctl.c
  head/usr.bin/talk/init_disp.c
  head/usr.bin/talk/invite.c
  head/usr.bin/talk/talk.h

Modified: head/usr.bin/talk/ctl.c
==============================================================================
--- head/usr.bin/talk/ctl.c	Sun Nov  6 08:17:17 2011	(r227184)
+++ head/usr.bin/talk/ctl.c	Sun Nov  6 08:17:23 2011	(r227185)
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)ctl.c	
 #include <string.h>
 
 #include "talk.h"
+#include "talk_ctl.h"
 
 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 };

Modified: head/usr.bin/talk/init_disp.c
==============================================================================
--- head/usr.bin/talk/init_disp.c	Sun Nov  6 08:17:17 2011	(r227184)
+++ head/usr.bin/talk/init_disp.c	Sun Nov  6 08:17:23 2011	(r227185)
@@ -50,8 +50,6 @@ static const char sccsid[] = "@(#)init_d
 
 #include "talk.h"
 
-extern volatile sig_atomic_t gotwinch;
-
 /*
  * Make sure the callee can write to the screen
  */

Modified: head/usr.bin/talk/invite.c
==============================================================================
--- head/usr.bin/talk/invite.c	Sun Nov  6 08:17:17 2011	(r227184)
+++ head/usr.bin/talk/invite.c	Sun Nov  6 08:17:23 2011	(r227185)
@@ -60,8 +60,8 @@ static const char sccsid[] = "@(#)invite
  * These are used to delete the
  * invitations.
  */
-int	local_id, remote_id;
-jmp_buf invitebuf;
+static int	local_id, remote_id;
+static jmp_buf invitebuf;
 
 void
 invite_remote(void)

Modified: head/usr.bin/talk/talk.h
==============================================================================
--- head/usr.bin/talk/talk.h	Sun Nov  6 08:17:17 2011	(r227184)
+++ head/usr.bin/talk/talk.h	Sun Nov  6 08:17:23 2011	(r227185)
@@ -38,6 +38,7 @@
 #include <arpa/inet.h>
 #include <protocols/talkd.h>
 #include <curses.h>
+#include <signal.h>
 
 extern	int sockt;
 extern	int curses_initialized;
@@ -46,6 +47,8 @@ extern	int invitation_waiting;
 extern	const char *current_state;
 extern	int current_line;
 
+extern volatile sig_atomic_t gotwinch;
+
 typedef struct xwin {
 	WINDOW	*x_win;
 	int	x_nlines;