PERFORCE change 142565 for review
John Birrell
jb at FreeBSD.org
Fri May 30 04:24:28 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142565
Change 142565 by jb at freebsd3 on 2008/05/30 04:24:06
IF6
Affected files ...
.. //depot/projects/dtrace6/src/etc/defaults/bluetooth.device.conf#2 integrate
.. //depot/projects/dtrace6/src/include/string.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/string/memchr.3#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/string/memrchr.c#1 branch
.. //depot/projects/dtrace6/src/share/man/man5/bluetooth.device.conf.5#2 integrate
.. //depot/projects/dtrace6/src/share/timedef/hu_HU.ISO8859-2.src#2 integrate
.. //depot/projects/dtrace6/src/share/timedef/hu_HU.UTF-8.src#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/tty.c#2 integrate
.. //depot/projects/dtrace6/src/sys/net/if_media.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/param.h#8 integrate
Differences ...
==== //depot/projects/dtrace6/src/etc/defaults/bluetooth.device.conf#2 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1.2.1 2005/11/23 18:03:32 emax Exp $
+# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1.2.2 2008/05/30 00:42:49 emax Exp $
# The authentication_enable parameter controls if the device requires to
# authenticate the remote device at connection setup. At connection setup,
@@ -39,8 +39,7 @@
# The class parameter is used to indicate the capabilities of the device to
# other devices.
#
-# For more details see
-# https://www.bluetooth.org/foundry/assignnumb/document/baseband
+# For more details see "Assigned Numbers - Bluetooth Baseband" document
#
# Possible value:
#
@@ -101,7 +100,7 @@
# The role_switch parameter controls whether the local device should perform
# role switch. By default, if role switch is supported, the local device will
# try to perform role switch and become Master on incoming connection. Some
-# devices do not support role switch and thus incomming connections from such
+# devices do not support role switch and thus incoming connections from such
# devices will fail. If role switch is disabled then accepting device will
# remain Slave.
#
==== //depot/projects/dtrace6/src/include/string.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)string.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.21.2.1 2005/08/29 18:46:39 andre Exp $
+ * $FreeBSD: src/include/string.h,v 1.21.2.2 2008/05/27 20:04:27 delphij Exp $
*/
#ifndef _STRING_H_
@@ -59,6 +59,7 @@
void *memccpy(void * __restrict, const void * __restrict, int, size_t);
#endif
void *memchr(const void *, int, size_t) __pure;
+void *memrchr(const void *, int, size_t) __pure;
int memcmp(const void *, const void *, size_t) __pure;
void *memcpy(void * __restrict, const void * __restrict, size_t);
#if __BSD_VISIBLE
==== //depot/projects/dtrace6/src/lib/libc/string/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34.8.1 2005/08/29 18:46:39 andre Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34.8.2 2008/05/27 20:04:27 delphij Exp $
.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
@@ -7,7 +7,7 @@
# machine-independent string sources
MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \
- memchr.c memcmp.c \
+ memchr.c memrchr.c memcmp.c \
memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \
strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \
strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \
@@ -37,6 +37,7 @@
MLINKS+=ffs.3 fls.3
MLINKS+=ffs.3 flsl.3
MLINKS+=index.3 rindex.3
+MLINKS+=memchr.3 memrchr.3
MLINKS+=strcasecmp.3 strncasecmp.3
MLINKS+=strcat.3 strncat.3
MLINKS+=strchr.3 strrchr.3
==== //depot/projects/dtrace6/src/lib/libc/string/memchr.3#2 (text+ko) ====
@@ -34,9 +34,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)memchr.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.7.14.2 2007/05/31 18:37:09 cperciva Exp $
+.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.7.14.3 2008/05/27 20:04:27 delphij Exp $
.\"
-.Dd June 4, 1993
+.Dd April 9, 2008
.Dt MEMCHR 3
.Os
.Sh NAME
@@ -48,6 +48,8 @@
.In string.h
.Ft void *
.Fn memchr "const void *b" "int c" "size_t len"
+.Ft void *
+.Fn memrchr "const void *b" "int c" "size_t len"
.Sh DESCRIPTION
The
.Fn memchr
@@ -57,11 +59,22 @@
(converted to an unsigned char)
in string
.Fa b .
+.Pp
+The
+.Fn memrchr
+function behaves like
+.Fn memchr ,
+except that it locates the last occurrence of
+.Fa c
+in string
+.Fa b .
.Sh RETURN VALUES
The
.Fn memchr
-function
-returns a pointer to the byte located,
+and
+.Fn memrchr
+functions
+return a pointer to the byte located,
or NULL if no such byte exists within
.Fa len
bytes.
@@ -81,3 +94,15 @@
function
conforms to
.St -isoC .
+.Pp
+The
+.Fn memrchr
+function is a GNU extension and conforms to no standard.
+.Sh HISTORY
+The
+.Fn memrchr
+function first appeared in GNU libc 2.1.91, this implementation
+first appeared in
+.Fx 8.0 ,
+coming from
+.Ox 4.3 .
==== //depot/projects/dtrace6/src/share/man/man5/bluetooth.device.conf.5#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.1.2.1 2005/12/05 18:54:45 emax Exp $
+.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.1.2.2 2008/05/30 00:42:50 emax Exp $
.\"
-.Dd Dec 1, 2005
+.Dd May 27, 2008
.Dt BLUETOOTH.DEVICE.CONF 5
.Os
.Sh NAME
@@ -56,7 +56,7 @@
The script accepts Bluetooth device driver name as an extra parameter.
.Pp
The system wide Bluetooth device configuration file is called
-.Pa /etc/defaults/bluetooth.device.conf .
+.Pa /etc/defaults/\:bluetooth.device.conf .
Configuration parameters set in the system wide Bluetooth device configuration
file apply to every Bluetooth device connected to the system.
.Pp
@@ -90,7 +90,8 @@
parameter is used to indicate the capabilities of the device to
other devices.
For more details see
-https://www.bluetooth.org/foundry/assignnumb/document/baseband.
+.Dq Assigned Numbers - Bluetooth Baseband
+document.
.It Va connectable
.Pq Vt bool
The
==== //depot/projects/dtrace6/src/share/timedef/hu_HU.ISO8859-2.src#2 (text+ko) ====
@@ -1,56 +1,56 @@
# This is a Hungarian LC_TIME file for ISO 8859-2 code-table
# Made by Gabor Zahemszky <zgabor at CoDe.hu>
-# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.6 2001/03/21 22:54:44 ache Exp $
+# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.6.16.1 2008/05/26 19:26:10 gabor Exp $
#
# Short month names
#
-Jan
-Feb
-Már
-Ápr
-Máj
-Jún
-Júl
-Aug
-Sze
-Okt
-Nov
-Dec
+jan
+feb
+már
+ápr
+máj
+jún
+júl
+aug
+sze
+okt
+nov
+dec
#
-# Long month names
+# Long month names (as in a date)
#
-Január
-Február
-Március
-Április
-Május
-Június
-Július
-Augusztus
-Szeptember
-Október
-November
-December
+január
+február
+március
+április
+május
+június
+július
+augusztus
+szeptember
+október
+november
+december
#
# Short weekday names
#
-Vas
-Hét
-Ked
-Sze
-Csü
-Pén
-Szo
+vas
+hét
+ked
+sze
+csü
+pén
+szo
#
# Long weekday names
#
-Vasárnap
-Hétfõ
-Kedd
-Szerda
-Csütörtök
-Péntek
-Szombat
+vasárnap
+hétfõ
+kedd
+szerda
+csütörtök
+péntek
+szombat
#
# X_fmt
#
@@ -76,20 +76,20 @@
#
%Y %b %e %a %X %Z
#
-# Long months names (alternative)
+# Long month names (without case ending)
#
-Január
-Február
-Március
-Április
-Május
-Június
-Július
-Augusztus
-Szeptember
-Október
-November
-December
+január
+február
+március
+április
+május
+június
+július
+augusztus
+szeptember
+október
+november
+december
#
# md_order
#
==== //depot/projects/dtrace6/src/share/timedef/hu_HU.UTF-8.src#2 (text+ko) ====
@@ -1,56 +1,56 @@
# This is a Hungarian LC_TIME file for ISO 8859-2 code-table
# Made by Gabor Zahemszky <zgabor at CoDe.hu>
-# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
+# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.1.8.1 2008/05/26 19:26:10 gabor Exp $
#
# Short month names
#
-Jan
-Feb
-Már
-Ãpr
-Máj
-Jún
-Júl
-Aug
-Sze
-Okt
-Nov
-Dec
+jan
+feb
+már
+ápr
+máj
+jún
+júl
+aug
+sze
+okt
+nov
+dec
#
-# Long month names
+# Long month names (as in a date)
#
-Január
-Február
-Március
-Ãprilis
-Május
-Június
-Július
-Augusztus
-Szeptember
-Október
-November
-December
+január
+február
+március
+április
+május
+június
+július
+augusztus
+szeptember
+október
+november
+december
#
# Short weekday names
#
-Vas
-Hét
-Ked
-Sze
-Csü
-Pén
-Szo
+vas
+hét
+ked
+sze
+csü
+pén
+szo
#
# Long weekday names
#
-Vasárnap
-Hétfő
-Kedd
-Szerda
-Csütörtök
-Péntek
-Szombat
+vasárnap
+hétfő
+kedd
+szerda
+csütörtök
+péntek
+szombat
#
# X_fmt
#
@@ -76,20 +76,20 @@
#
%Y %b %e %a %X %Z
#
-# Long months names (alternative)
+# Long month names (without case ending)
#
-Január
-Február
-Március
-Ãprilis
-Május
-Június
-Július
-Augusztus
-Szeptember
-Október
-November
-December
+január
+február
+március
+április
+május
+június
+július
+augusztus
+szeptember
+október
+november
+december
#
# md_order
#
==== //depot/projects/dtrace6/src/sys/kern/tty.c#2 (text+ko) ====
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.250.2.5 2007/08/03 14:24:38 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.250.2.6 2008/05/26 11:15:15 kib Exp $");
#include "opt_compat.h"
#include "opt_tty.h"
@@ -3141,7 +3141,7 @@
return (EBUSY);
error = tsleep(&tp->t_actout,
TTIPRI | PCATCH, "ttybi", 0);
- if (error != 0 || (tp->t_flags & TS_GONE))
+ if (error != 0 || (tp->t_state & TS_GONE))
goto out;
goto open_top;
}
==== //depot/projects/dtrace6/src/sys/net/if_media.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
-/* $FreeBSD: src/sys/net/if_media.h,v 1.30.2.5 2007/06/14 20:02:41 davidch Exp $ */
+/* $FreeBSD: src/sys/net/if_media.h,v 1.30.2.6 2008/05/27 18:33:17 antoine Exp $ */
/*-
* Copyright (c) 1997
@@ -340,7 +340,6 @@
{ IFM_1000_LX, "1000baseLX" }, \
{ IFM_1000_CX, "1000baseCX" }, \
{ IFM_1000_T, "1000baseTX" }, \
- { IFM_1000_T, "1000baseT" }, \
{ IFM_HPNA_1, "homePNA" }, \
{ IFM_10G_LR, "10Gbase-LR" }, \
{ IFM_10G_SR, "10Gbase-SR" }, \
@@ -365,6 +364,7 @@
{ IFM_1000_SX, "1000SX" }, \
{ IFM_1000_LX, "1000LX" }, \
{ IFM_1000_CX, "1000CX" }, \
+ { IFM_1000_T, "1000baseT" }, \
{ IFM_1000_T, "1000TX" }, \
{ IFM_1000_T, "1000T" }, \
{ IFM_2500_SX, "2500SX" }, \
==== //depot/projects/dtrace6/src/sys/sys/param.h#8 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.244.2.36 2008/04/24 10:46:23 dfr Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.244.2.37 2008/05/27 20:04:27 delphij Exp $
*/
#ifndef _SYS_PARAM_H_
@@ -57,7 +57,7 @@
* is created, otherwise 1.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 603102 /* Master, propagated to newvers */
+#define __FreeBSD_version 603103 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>
@@ -329,20 +329,4 @@
#define ctodb(db) /* calculates pages to devblks */ \
((db) << (PAGE_SHIFT - DEV_BSHIFT))
-/*
- * Solaris compatibility definitions.
- */
-#ifdef _SOLARIS_C_SOURCE
-#define PAGESIZE PAGE_SIZE
-
-/*
- * The OpenSolaris version is set according to the version last imported
- * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header
- * files it can be used to determine the level of compatibility that the
- * FreeBSD headers provide to OpenSolaris code. Perhaps one day there
- * will be a really, really Single Unix Specification.
- */
-#define __OpenSolaris_version 20071001
-#endif
-
#endif /* _SYS_PARAM_H_ */
More information about the p4-projects
mailing list