From owner-svn-src-all@FreeBSD.ORG  Sun Jan  1 19:05:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE80E1065670;
	Sun,  1 Jan 2012 19:05:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8E0E8FC0C;
	Sun,  1 Jan 2012 19:05:15 +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 q01J5FJr026197;
	Sun, 1 Jan 2012 19:05:15 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01J5F1v026195;
	Sun, 1 Jan 2012 19:05:15 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201011905.q01J5F1v026195@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 1 Jan 2012 19:05:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229188 - stable/9/contrib/ee
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jan 2012 19:05:16 -0000

Author: dim
Date: Sun Jan  1 19:05:15 2012
New Revision: 229188
URL: http://svn.freebsd.org/changeset/base/229188

Log:
  MFC r228627:
  
  In contrib/ee/ee.c, fix a few warnings about format strings not being
  literals.  Also, change the direction argument to move_rel() from char
  to int; K&R function definions cause it to be promoted to an int anyway,
  and this way we avoid clang warning about it.

Modified:
  stable/9/contrib/ee/ee.c
Directory Properties:
  stable/9/contrib/ee/   (props changed)

Modified: stable/9/contrib/ee/ee.c
==============================================================================
--- stable/9/contrib/ee/ee.c	Sun Jan  1 18:59:35 2012	(r229187)
+++ stable/9/contrib/ee/ee.c	Sun Jan  1 19:05:15 2012	(r229188)
@@ -307,7 +307,7 @@ void undel_word P_((void));
 void del_line P_((void));
 void undel_line P_((void));
 void adv_word P_((void));
-void move_rel P_((char direction, int lines));
+void move_rel P_((int direction, int lines));
 void eol P_((void));
 void bol P_((void));
 void adv_line P_((void));
@@ -2105,10 +2105,10 @@ char *arguments[];
 		else if (!strcmp("-?", buff))
 		{
 			fprintf(stderr, usage0, arguments[0]);
-			fprintf(stderr, usage1);
-			fprintf(stderr, usage2);
-			fprintf(stderr, usage3);
-			fprintf(stderr, usage4);
+			fputs(usage1, stderr);
+			fputs(usage2, stderr);
+			fputs(usage3, stderr);
+			fputs(usage4, stderr);
 			exit(1);
 		}
 		else if ((*buff == '+') && (start_at_line == NULL))
@@ -2939,7 +2939,7 @@ while ((position < curr_line->line_lengt
 
 void 
 move_rel(direction, lines)	/* move relative to current line	*/
-char direction;
+int direction;
 int lines;
 {
 	int i;
@@ -3242,7 +3242,7 @@ char *string;		/* string containing user
 	}
 	if (shell_fork)
 	{
-		printf(continue_msg);
+		fputs(continue_msg, stdout);
 		fflush(stdout);
 		while ((in = getchar()) != '\n')
 			;