Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Observe the following spelling:
details: https://anonhg.NetBSD.org/src/rev/57eaafbbe97f
branches: trunk
changeset: 759786:57eaafbbe97f
user: wiz <wiz%NetBSD.org@localhost>
date: Thu Dec 16 17:42:25 2010 +0000
description:
Observe the following spelling:
- wide character (noun)
- wide-character (adjective)
Inspired by jmc@OpenBSD.
diffstat:
external/bsd/libarchive/dist/libarchive/archive_entry.3 | 4 ++--
external/bsd/pcc/dist/pcc/cc/ccom/scan.l | 6 +++---
external/bsd/pcc/dist/pcc/configure.ac | 2 +-
external/bsd/tre/dist/doc/tre-api.html | 4 ++--
external/gpl3/binutils/dist/binutils/doc/strings.1 | 2 +-
gnu/dist/gcc4/gcc/c-format.c | 2 +-
gnu/dist/gcc4/gcc/doc/cpp.texi | 2 +-
gnu/dist/gcc4/gcc/doc/implement-c.texi | 2 +-
lib/libc/locale/_wcstod.h | 10 +++++-----
lib/libc/locale/mbsrtowcs.3 | 10 +++++-----
lib/libc/locale/mbstowcs.3 | 8 ++++----
lib/libc/locale/wcscoll.3 | 4 ++--
lib/libc/locale/wcsrtombs.3 | 8 ++++----
lib/libc/locale/wcstol.3 | 4 ++--
lib/libc/locale/wcstombs.3 | 8 ++++----
lib/libc/locale/wcsxfrm.3 | 4 ++--
lib/libc/stdio/fgetwln.3 | 4 ++--
lib/libc/stdio/fgetws.3 | 4 ++--
lib/libc/stdio/fputws.3 | 4 ++--
lib/libc/stdio/getwc.3 | 8 ++++----
lib/libc/stdio/printf.3 | 4 ++--
lib/libc/stdio/putwc.3 | 8 ++++----
lib/libc/stdio/ungetwc.3 | 14 +++++++-------
lib/libc/stdio/vfscanf.c | 6 +++---
lib/libc/stdio/vfwprintf.c | 8 ++++----
lib/libc/stdio/wprintf.3 | 4 ++--
lib/libc/stdio/wscanf.3 | 6 +++---
lib/libc/string/wcscasecmp.3 | 4 ++--
lib/libc/string/wcsdup.3 | 4 ++--
lib/libc/string/wcstok.3 | 8 ++++----
lib/libc/string/wmemchr.3 | 6 +++---
lib/libcurses/addbytes.c | 6 +++---
lib/libcurses/cchar.c | 8 ++++----
lib/libcurses/curses.h | 8 ++++----
lib/libcurses/curses_private.h | 6 +++---
lib/libcurses/get_wch.c | 8 ++++----
lib/libcurses/ins_wstr.c | 8 ++++----
lib/libedit/chartype.h | 6 +++---
lib/libedit/editline.3 | 6 +++---
share/doc/smm/01.setup/3.t | 4 ++--
share/man/man0/title.cdrom | 4 ++--
share/man/man0/title.urm | 4 ++--
usr.bin/xlint/lint1/scan.l | 6 +++---
usr.sbin/chrtbl/chrtbl.8 | 6 ++++--
44 files changed, 127 insertions(+), 125 deletions(-)
diffs (truncated from 1095 to 300 lines):
diff -r 0850f68244e1 -r 57eaafbbe97f external/bsd/libarchive/dist/libarchive/archive_entry.3
--- a/external/bsd/libarchive/dist/libarchive/archive_entry.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_entry.3 Thu Dec 16 17:42:25 2010 +0000
@@ -336,11 +336,11 @@
In the case of strings, a const-qualified pointer to
the string is returned.
.El
-String data can be set or accessed as wide character strings
+String data can be set or accessed as wide-character strings
or normal
.Va char
strings.
-The functions that use wide character strings are suffixed with
+The functions that use wide-character strings are suffixed with
.Cm _w .
Note that these are different representations of the same data:
For example, if you store a narrow string and read the corresponding
diff -r 0850f68244e1 -r 57eaafbbe97f external/bsd/pcc/dist/pcc/cc/ccom/scan.l
--- a/external/bsd/pcc/dist/pcc/cc/ccom/scan.l Thu Dec 16 17:17:07 2010 +0000
+++ b/external/bsd/pcc/dist/pcc/cc/ccom/scan.l Thu Dec 16 17:42:25 2010 +0000
@@ -1,6 +1,6 @@
%{
/* Id: scan.l,v 1.91 2010/05/21 19:37:32 ragge Exp */
-/* $NetBSD: scan.l,v 1.1.1.3 2010/06/03 18:57:43 plunky Exp $ */
+/* $NetBSD: scan.l,v 1.2 2010/12/16 17:42:26 wiz Exp $ */
/*
* Copyright (c) 2002 Anders Magnusson. All rights reserved.
@@ -527,9 +527,9 @@
}
if (i == 0)
- uerror("empty wide character constant");
+ uerror("empty wide-character constant");
if (i > 1)
- werror("too many characters in wide character constant");
+ werror("too many characters in wide-character constant");
return xbcon(lastcon, NULL, ctype(UNSIGNED));
}
diff -r 0850f68244e1 -r 57eaafbbe97f external/bsd/pcc/dist/pcc/configure.ac
--- a/external/bsd/pcc/dist/pcc/configure.ac Thu Dec 16 17:17:07 2010 +0000
+++ b/external/bsd/pcc/dist/pcc/configure.ac Thu Dec 16 17:42:25 2010 +0000
@@ -316,7 +316,7 @@
fi
AC_DEFINE_UNQUOTED(WCHAR_TYPE, $wchar_type, [Type to use for wide characters])
-AC_DEFINE_UNQUOTED(WCHAR_SIZE, $wchar_size, [Size of wide character type])
+AC_DEFINE_UNQUOTED(WCHAR_SIZE, $wchar_size, [Size of wide-character type])
# check for additional compiler flags
AC_PROG_CC
diff -r 0850f68244e1 -r 57eaafbbe97f external/bsd/tre/dist/doc/tre-api.html
--- a/external/bsd/tre/dist/doc/tre-api.html Thu Dec 16 17:17:07 2010 +0000
+++ b/external/bsd/tre/dist/doc/tre-api.html Thu Dec 16 17:42:25 2010 +0000
@@ -58,8 +58,8 @@
null bytes. The <tt><font class="func">regwcomp</font>()</tt> and
<tt><font class="func">regwncomp</font>()</tt> functions work like
<tt><font class="func">regcomp</font>()</tt> and <tt><font
-class="func">regncomp</font>()</tt>, respectively, but take a wide
-character (<tt><font class="type">wchar_t</font></tt>) string
+class="func">regncomp</font>()</tt>, respectively, but take a
+wide-character (<tt><font class="type">wchar_t</font></tt>) string
instead of a byte string.
</p>
diff -r 0850f68244e1 -r 57eaafbbe97f external/gpl3/binutils/dist/binutils/doc/strings.1
--- a/external/gpl3/binutils/dist/binutils/doc/strings.1 Thu Dec 16 17:17:07 2010 +0000
+++ b/external/gpl3/binutils/dist/binutils/doc/strings.1 Thu Dec 16 17:42:25 2010 +0000
@@ -208,7 +208,7 @@
characters (\s-1ASCII\s0, \s-1ISO\s0 8859, etc., default), \fBS\fR =
single\-8\-bit\-byte characters, \fBb\fR = 16\-bit bigendian, \fBl\fR =
16\-bit littleendian, \fBB\fR = 32\-bit bigendian, \fBL\fR = 32\-bit
-littleendian. Useful for finding wide character strings. (\fBl\fR
+littleendian. Useful for finding wide-character strings. (\fBl\fR
and \fBb\fR apply to, for example, Unicode \s-1UTF\-16/UCS\-2\s0 encodings).
.IP "\fB\-T\fR \fIbfdname\fR" 4
.IX Item "-T bfdname"
diff -r 0850f68244e1 -r 57eaafbbe97f gnu/dist/gcc4/gcc/c-format.c
--- a/gnu/dist/gcc4/gcc/c-format.c Thu Dec 16 17:17:07 2010 +0000
+++ b/gnu/dist/gcc4/gcc/c-format.c Thu Dec 16 17:42:25 2010 +0000
@@ -1250,7 +1250,7 @@
format_types[info->format_type].name);
if (res.number_wide > 0)
- warning (OPT_Wformat, "format is a wide character string");
+ warning (OPT_Wformat, "format is a wide-character string");
if (res.number_unterminated > 0)
warning (OPT_Wformat, "unterminated format string");
diff -r 0850f68244e1 -r 57eaafbbe97f gnu/dist/gcc4/gcc/doc/cpp.texi
--- a/gnu/dist/gcc4/gcc/doc/cpp.texi Thu Dec 16 17:17:07 2010 +0000
+++ b/gnu/dist/gcc4/gcc/doc/cpp.texi Thu Dec 16 17:42:25 2010 +0000
@@ -272,7 +272,7 @@
The default is UTF-16 or UTF-32, whichever fits in the target's
@code{wchar_t} type, in the target machine's byte
order.@footnote{UTF-16 does not meet the requirements of the C
-standard for a wide character set, but the choice of 16-bit
+standard for a wide-character set, but the choice of 16-bit
@code{wchar_t} is enshrined in some system ABIs so we cannot fix
this.} Octal and hexadecimal escape sequences do not undergo
conversion; @t{'\x12'} has the value 0x12 regardless of the currently
diff -r 0850f68244e1 -r 57eaafbbe97f gnu/dist/gcc4/gcc/doc/implement-c.texi
--- a/gnu/dist/gcc4/gcc/doc/implement-c.texi Thu Dec 16 17:17:07 2010 +0000
+++ b/gnu/dist/gcc4/gcc/doc/implement-c.texi Thu Dec 16 17:42:25 2010 +0000
@@ -161,7 +161,7 @@
behavior, cpp, The C Preprocessor}.
@item
-@cite{The value of a wide character constant containing more than one
+@cite{The value of a wide-character constant containing more than one
multibyte character, or containing a multibyte character or escape
sequence not represented in the extended execution character set (C90
6.1.3.4, C99 6.4.4.4).}
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/_wcstod.h
--- a/lib/libc/locale/_wcstod.h Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/_wcstod.h Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _wcstod.h,v 1.1 2006/04/15 12:17:23 tnozaki Exp $ */
+/* $NetBSD: _wcstod.h,v 1.2 2010/12/16 17:42:27 wiz Exp $ */
/*-
* Copyright (c) 2002 Tim J. Robbins
@@ -46,7 +46,7 @@
*
* This is the wide-character counterpart of strto{f,d,ld}(). So that
* we do not have to duplicate the code of strto{f,d,ld}() here,
- * we convert the supplied wide character string to multibyte and
+ * we convert the supplied wide-character string to multibyte and
* call strto{f,d,ld}() on the result.
* This assumes that the multibyte encoding is compatible with ASCII
* for at least the digits, radix character and letters.
@@ -69,10 +69,10 @@
goto no_convert;
/*
- * Convert the supplied numeric wide char. string to multibyte.
+ * Convert the supplied numeric wide-char. string to multibyte.
*
* We could attempt to find the end of the numeric portion of the
- * wide char. string to avoid converting unneeded characters but
+ * wide-char. string to avoid converting unneeded characters but
* choose not to bother; optimising the uncommon case where
* the input string contains a lot of text after the number
* duplicates a lot of strto{f,d,ld}()'s functionality and
@@ -108,7 +108,7 @@
* We only know where the number ended in the _multibyte_
* representation of the string. If the caller wants to know
* where it ended, count multibyte characters to find the
- * corresponding position in the wide char string.
+ * corresponding position in the wide-char string.
*/
if (endptr != NULL)
/* XXX Assume each wide char is one byte. */
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/mbsrtowcs.3
--- a/lib/libc/locale/mbsrtowcs.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/mbsrtowcs.3 Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbsrtowcs.3,v 1.11 2006/10/16 09:10:40 wiz Exp $
+.\" $NetBSD: mbsrtowcs.3,v 1.12 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbsrtowcs
-.Nd converts a multibyte character string to a wide character string \
+.Nd converts a multibyte character string to a wide-character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh LIBRARY
@@ -47,7 +47,7 @@
.Fn mbsrtowcs
converts the multibyte character string indirectly pointed to by
.Fa s
-to the corresponding wide character string, and stores it in the
+to the corresponding wide-character string, and stores it in the
array pointed to by
.Fa pwcs .
The conversion stops due to the following reasons:
@@ -99,7 +99,7 @@
.It "s == NULL || *s == NULL"
Undefined (may cause the program to crash).
.It "pwcs == NULL"
-The conversion has taken place, but the resulting wide character string
+The conversion has taken place, but the resulting wide-character string
was discarded.
In this case, the pointer object pointed to by
.Fa s
@@ -136,7 +136,7 @@
.Dv NULL
and the value returned is equal to
.Fa n ,
-the wide character string pointed to by
+the wide-character string pointed to by
.Fa pwcs
is not nul-terminated.
If
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/mbstowcs.3
--- a/lib/libc/locale/mbstowcs.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/mbstowcs.3 Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbstowcs.3,v 1.10 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: mbstowcs.3,v 1.11 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbstowcs
-.Nd converts a multibyte character string to a wide character string
+.Nd converts a multibyte character string to a wide-character string
.\" ----------------------------------------------------------------------
.Sh LIBRARY
.Lb libc
@@ -44,7 +44,7 @@
.Fn mbstowcs
converts a nul-terminated multibyte character string pointed to by
.Fa s
-to the corresponding wide character string and stores it in the array
+to the corresponding wide-character string and stores it in the array
pointed to by
.Fa pwcs .
This function may modify the first at most
@@ -67,7 +67,7 @@
.Bl -tag -width 012345678901
.It pwcs == NULL
.Fn mbstowcs
-returns the number of elements to store the whole wide character string
+returns the number of elements to store the whole wide-character string
corresponding to the multibyte character string pointed to by
.Fa s .
In this case,
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/wcscoll.3
--- a/lib/libc/locale/wcscoll.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/wcscoll.3 Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcscoll.3,v 1.2 2006/10/14 07:44:58 wiz Exp $
+.\" $NetBSD: wcscoll.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -88,7 +88,7 @@
function will fail if:
.Bl -tag -width Er
.It Bq Er EILSEQ
-An invalid wide character code was specified.
+An invalid wide-character code was specified.
.It Bq Er ENOMEM
Cannot allocate enough memory for temporary buffers.
.El
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/wcsrtombs.3
--- a/lib/libc/locale/wcsrtombs.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/wcsrtombs.3 Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcsrtombs.3,v 1.12 2006/10/16 08:42:16 wiz Exp $
+.\" $NetBSD: wcsrtombs.3,v 1.13 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
.\" All rights reserved.
@@ -30,7 +30,7 @@
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm wcsrtombs
-.Nd converts a wide character string to a multibyte character string \
+.Nd converts a wide-character string to a multibyte character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh LIBRARY
@@ -45,7 +45,7 @@
.Sh DESCRIPTION
The
.Fn wcsrtombs
-converts the nul-terminated wide character string indirectly pointed
+converts the nul-terminated wide-character string indirectly pointed
to by
.Fa pwcs
to the corresponding multibyte character string,
@@ -102,7 +102,7 @@
.It "s == NULL"
.Fn wcsrtombs
returns the number of bytes to store the whole multibyte character string
-corresponding to the wide character string pointed to by
+corresponding to the wide-character string pointed to by
.Fa pwcs ,
not including the terminating nul byte.
In this case,
diff -r 0850f68244e1 -r 57eaafbbe97f lib/libc/locale/wcstol.3
--- a/lib/libc/locale/wcstol.3 Thu Dec 16 17:17:07 2010 +0000
+++ b/lib/libc/locale/wcstol.3 Thu Dec 16 17:42:25 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wcstol.3,v 1.2 2006/08/08 17:32:05 wiz Exp $
+.\" $NetBSD: wcstol.3,v 1.3 2010/12/16 17:42:27 wiz Exp $
.\"
.\" Copyright (c) 2002 Tim J. Robbins
.\" All rights reserved.
@@ -33,7 +33,7 @@
.Nm wcstol , wcstoul ,
- Prev by Date:
[src/trunk]: src Document __dead, __pure, __constfunc, __noinline, __unused, ...
- Next by Date:
[src/trunk]: src Reference __builtin_object_size(3) and attribute(3) with eac...
- Previous by Thread:
[src/trunk]: src Document __dead, __pure, __constfunc, __noinline, __unused, ...
- Next by Thread:
[src/trunk]: src Reference __builtin_object_size(3) and attribute(3) with eac...
- Indexes:
Home |
Main Index |
Thread Index |
Old Index