From owner-svn-src-head@FreeBSD.ORG  Thu Oct 25 15:45:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D2178294;
 Thu, 25 Oct 2012 15:45:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id B6A5E8FC0C;
 Thu, 25 Oct 2012 15:45:32 +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 q9PFjWg1091172;
 Thu, 25 Oct 2012 15:45:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9PFjWLJ091170;
 Thu, 25 Oct 2012 15:45:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210251545.q9PFjWLJ091170@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 25 Oct 2012 15:45:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242084 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 25 Oct 2012 15:45:33 -0000

Author: mav
Date: Thu Oct 25 15:45:32 2012
New Revision: 242084
URL: http://svn.freebsd.org/changeset/base/242084

Log:
  Remove new-line characters from the include() errors to make it consistent
  with the rest of code.

Modified:
  head/sys/boot/common/interp.c

Modified: head/sys/boot/common/interp.c
==============================================================================
--- head/sys/boot/common/interp.c	Thu Oct 25 15:25:17 2012	(r242083)
+++ head/sys/boot/common/interp.c	Thu Oct 25 15:45:32 2012	(r242084)
@@ -211,7 +211,7 @@ include(const char *filename)
 #endif
 
     if (((fd = open(filename, O_RDONLY)) == -1)) {
-	sprintf(command_errbuf,"can't open '%s': %s\n", filename, strerror(errno));
+	sprintf(command_errbuf,"can't open '%s': %s", filename, strerror(errno));
 	return(CMD_ERROR);
     }
 
@@ -254,7 +254,7 @@ include(const char *filename)
 			free(se);
 		}
 		sprintf(command_errbuf, "file '%s' line %d: memory allocation "
-		    "failure - aborting\n", filename, line);
+		    "failure - aborting", filename, line);
 		return (CMD_ERROR);
 	}
 	strcpy(sp->text, cp);