From owner-svn-src-head@FreeBSD.ORG  Tue Feb  3 20:25:37 2009
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 2F9F31065706;
	Tue,  3 Feb 2009 20:25:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D8838FC1E;
	Tue,  3 Feb 2009 20:25:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n13KPbgB041015;
	Tue, 3 Feb 2009 20:25:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n13KPaCV041012;
	Tue, 3 Feb 2009 20:25:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200902032025.n13KPaCV041012@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 3 Feb 2009 20:25:36 +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: r188098 - head/lib/libc/string
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: Tue, 03 Feb 2009 20:25:37 -0000

Author: imp
Date: Tue Feb  3 20:25:36 2009
New Revision: 188098
URL: http://svn.freebsd.org/changeset/base/188098

Log:
  Fix the functions to match prototypes.  The K&R definitions differ
  from the ANSI-C prototype due to the 'int promotion' rule.

Modified:
  head/lib/libc/string/memchr.c
  head/lib/libc/string/strmode.c
  head/lib/libc/string/wmemset.c

Modified: head/lib/libc/string/memchr.c
==============================================================================
--- head/lib/libc/string/memchr.c	Tue Feb  3 20:01:51 2009	(r188097)
+++ head/lib/libc/string/memchr.c	Tue Feb  3 20:25:36 2009	(r188098)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 
 void *
-memchr(const void *s, unsigned char c, size_t n)
+memchr(const void *s, int c, size_t n)
 {
 	if (n != 0) {
 		const unsigned char *p = s;

Modified: head/lib/libc/string/strmode.c
==============================================================================
--- head/lib/libc/string/strmode.c	Tue Feb  3 20:01:51 2009	(r188097)
+++ head/lib/libc/string/strmode.c	Tue Feb  3 20:25:36 2009	(r188098)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 
 void
-strmode(mode_t mode, char *p)
+strmode(/* mode_t */ int mode, char *p)
 {
 	 /* print type */
 	switch (mode & S_IFMT) {

Modified: head/lib/libc/string/wmemset.c
==============================================================================
--- head/lib/libc/string/wmemset.c	Tue Feb  3 20:01:51 2009	(r188097)
+++ head/lib/libc/string/wmemset.c	Tue Feb  3 20:25:36 2009	(r188098)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <wchar.h>
 
 wchar_t	*
-wmemset(wchar_t *s, wchar_t *c, size_t n)
+wmemset(wchar_t *s, wchar_t c, size_t n)
 {
 	size_t i;
 	wchar_t *p;