svn commit: r333136 - head/lib/libbluetooth

[Vladimir Kondratyev]

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));
 }