From owner-svn-src-head@FreeBSD.ORG Tue Feb 3 20:35:19 2009 Return-Path: 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 9685E10656D5 for ; Tue, 3 Feb 2009 20:35:19 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id D088B8FC25 for ; Tue, 3 Feb 2009 20:35:18 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: (qmail invoked by alias); 03 Feb 2009 20:35:14 -0000 Received: from p54A3EB73.dip.t-dialin.net (EHLO tron.homeunix.org) [84.163.235.115] by mail.gmx.net (mp058) with SMTP; 03 Feb 2009 21:35:14 +0100 X-Authenticated: #1673122 X-Provags-ID: V01U2FsdGVkX19WAwdbyS1WQwlfl7wGwLpD3Rnt11QSYxb0UABaHc gw0/hxfL9iINCF Message-ID: <4988AA81.6010903@gmx.de> Date: Tue, 03 Feb 2009 21:35:13 +0100 From: Christoph Mallon User-Agent: Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: Warner Losh References: <200902032025.n13KPaCV041012@svn.freebsd.org> In-Reply-To: <200902032025.n13KPaCV041012@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 X-FuHaFi: 0.54 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Feb 2009 20:35:20 -0000 Warner Losh schrieb: > 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 > > 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; > This is not correct either, because now *p (of type unsigned char) gets compared with c (now type int). The manpage of memchr() states that "The memchr() function locates the first occurrence of c (converted to an unsigned char) in string b." The part in parentheses now is missing. This will break when you pass a negative number (e.g. -1, which should locate a byte with all bits set) to memchr().