From owner-svn-src-head@freebsd.org Tue May 1 08:03:13 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 883F7FB545F; Tue, 1 May 2018 08:03:13 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37D147FF10; Tue, 1 May 2018 08:03:13 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 301981F6CE; Tue, 1 May 2018 08:03:13 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4183DpW060831; Tue, 1 May 2018 08:03:13 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4183C9U060829; Tue, 1 May 2018 08:03:12 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201805010803.w4183C9U060829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Tue, 1 May 2018 08:03:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333136 - head/lib/libbluetooth X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/lib/libbluetooth X-SVN-Commit-Revision: 333136 X-SVN-Commit-Repository: base 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.25 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, 01 May 2018 08:03:13 -0000 Author: wulf Date: Tue May 1 08:03:12 2018 New Revision: 333136 URL: https://svnweb.freebsd.org/changeset/base/333136 Log: Fix bthidd build with GCC 4.2 after r333110 Rename inlined function parameter to avoid shadowing of devname libc function declared in stdlib.h header Reported by: lwhsu Tested by: lwhsu Modified: head/lib/libbluetooth/bluetooth.3 head/lib/libbluetooth/bluetooth.h Modified: head/lib/libbluetooth/bluetooth.3 ============================================================================== --- head/lib/libbluetooth/bluetooth.3 Tue May 1 04:31:17 2018 (r333135) +++ head/lib/libbluetooth/bluetooth.3 Tue May 1 08:03:12 2018 (r333136) @@ -25,7 +25,7 @@ .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ .\" $FreeBSD$ .\" -.Dd April 30, 2018 +.Dd May 1, 2018 .Dt BLUETOOTH 3 .Os .Sh NAME @@ -132,7 +132,7 @@ .Fn bt_devremote_name "char const *devname" "const bdaddr_t *remote" \ "time_t to" "uint16_t clk_off" "uint8_t ps_rep_mode" "uint8_t ps_mode" .Ft char * -.Fn bt_devremote_name_gen "char const *devname" "const bdaddr_t *remote" +.Fn bt_devremote_name_gen "char const *btooth_devname" "const bdaddr_t *remote" .Ft int .Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b" .Ft int Modified: head/lib/libbluetooth/bluetooth.h ============================================================================== --- head/lib/libbluetooth/bluetooth.h Tue May 1 04:31:17 2018 (r333135) +++ head/lib/libbluetooth/bluetooth.h Tue May 1 08:03:12 2018 (r333136) @@ -189,9 +189,9 @@ int bt_devinfo (struct bt_devinfo *di); int bt_devenum (bt_devenum_cb_t cb, void *arg); static __inline char * -bt_devremote_name_gen(char const *devname, const bdaddr_t *remote) +bt_devremote_name_gen(char const *btooth_devname, const bdaddr_t *remote) { - return (bt_devremote_name(devname, remote, 0, 0x0000, + return (bt_devremote_name(btooth_devname, remote, 0, 0x0000, NG_HCI_SCAN_REP_MODE0, NG_HCI_MANDATORY_PAGE_SCAN_MODE)); }