From owner-svn-src-head@FreeBSD.ORG Thu Jun 19 04:55:01 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52DCB1DC; Thu, 19 Jun 2014 04:55:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4003C254E; Thu, 19 Jun 2014 04:55:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5J4t1nj085424; Thu, 19 Jun 2014 04:55:01 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5J4t1f7085422; Thu, 19 Jun 2014 04:55:01 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201406190455.s5J4t1f7085422@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 19 Jun 2014 04:55:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267629 - head/lib/libc/sys 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.18 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: Thu, 19 Jun 2014 04:55:01 -0000 Author: kib Date: Thu Jun 19 04:55:00 2014 New Revision: 267629 URL: http://svnweb.freebsd.org/changeset/base/267629 Log: The time come to remove the wrapper, most likely, but tidy up it code instead for now. Remove spurious blank line, use C89 definition, wrap long line. Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/lib/libc/sys/mmap.c Modified: head/lib/libc/sys/mmap.c ============================================================================== --- head/lib/libc/sys/mmap.c Thu Jun 19 03:59:52 2014 (r267628) +++ head/lib/libc/sys/mmap.c Thu Jun 19 04:55:00 2014 (r267629) @@ -44,18 +44,13 @@ __FBSDID("$FreeBSD$"); * is not supplied by GCC 1.X but is supplied by GCC 2.X. */ void * -mmap(addr, len, prot, flags, fd, offset) - void * addr; - size_t len; - int prot; - int flags; - int fd; - off_t offset; +mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) { - if (__getosreldate() >= 700051) + if (__getosreldate() >= 700051) { return (__sys_mmap(addr, len, prot, flags, fd, offset)); - else - - return (__sys_freebsd6_mmap(addr, len, prot, flags, fd, 0, offset)); + } else { + return (__sys_freebsd6_mmap(addr, len, prot, flags, fd, 0, + offset)); + } }