diff options
| author | jmc <> | 2010-09-10 18:38:20 +0000 |
|---|---|---|
| committer | jmc <> | 2010-09-10 18:38:20 +0000 |
| commit | 47e979d0c84be8a65d97194c79668c3de2600f6f (patch) | |
| tree | 57adc327ed33cdce1199bdd11e3eb19f756f31a9 /src/lib/libc | |
| parent | d9f82ce863bd9db2aa9895c1ca5d07d82cc577ca (diff) | |
| download | openbsd-47e979d0c84be8a65d97194c79668c3de2600f6f.tar.gz openbsd-47e979d0c84be8a65d97194c79668c3de2600f6f.tar.bz2 openbsd-47e979d0c84be8a65d97194c79668c3de2600f6f.zip | |
observe the following spelling:
- wide character (noun)
- wide-character (adjective)
this is the "fix of least resistance", and appears to be in line with
posix style; a tiny fix still needed for curses, but i'll mail that
upstream;
Diffstat (limited to 'src/lib/libc')
| -rw-r--r-- | src/lib/libc/string/wcstok.3 | 10 | ||||
| -rw-r--r-- | src/lib/libc/string/wmemchr.3 | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libc/string/wcstok.3 b/src/lib/libc/string/wcstok.3 index fe65f120e3..945ec9b990 100644 --- a/src/lib/libc/string/wcstok.3 +++ b/src/lib/libc/string/wcstok.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: wcstok.3,v 1.5 2007/05/31 19:19:32 jmc Exp $ | 1 | .\" $OpenBSD: wcstok.3,v 1.6 2010/09/10 18:38:20 jmc Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" $NetBSD: wcstok.3,v 1.3 2003/09/08 17:54:33 wiz Exp $ | 3 | .\" $NetBSD: wcstok.3,v 1.3 2003/09/08 17:54:33 wiz Exp $ |
| 4 | .\" | 4 | .\" |
| @@ -54,7 +54,7 @@ | |||
| 54 | .\" Original version ID: | 54 | .\" Original version ID: |
| 55 | .\" FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp | 55 | .\" FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp |
| 56 | .\" | 56 | .\" |
| 57 | .Dd $Mdocdate: May 31 2007 $ | 57 | .Dd $Mdocdate: September 10 2010 $ |
| 58 | .Dt WCSTOK 3 | 58 | .Dt WCSTOK 3 |
| 59 | .Os | 59 | .Os |
| 60 | .Sh NAME | 60 | .Sh NAME |
| @@ -68,7 +68,7 @@ | |||
| 68 | The | 68 | The |
| 69 | .Fn wcstok | 69 | .Fn wcstok |
| 70 | function | 70 | function |
| 71 | is used to isolate sequential tokens in a NUL-terminated wide character | 71 | is used to isolate sequential tokens in a NUL-terminated wide-character |
| 72 | string, | 72 | string, |
| 73 | .Fa str . | 73 | .Fa str . |
| 74 | These tokens are separated in the string by at least one of the | 74 | These tokens are separated in the string by at least one of the |
| @@ -89,7 +89,7 @@ must be provided on each call. | |||
| 89 | .Pp | 89 | .Pp |
| 90 | The | 90 | The |
| 91 | .Fn wcstok | 91 | .Fn wcstok |
| 92 | function is the wide character counterpart of the | 92 | function is the wide-character counterpart of the |
| 93 | .Fn strtok_r | 93 | .Fn strtok_r |
| 94 | function. | 94 | function. |
| 95 | .Sh RETURN VALUES | 95 | .Sh RETURN VALUES |
| @@ -100,7 +100,7 @@ returns a pointer to the beginning of each subsequent token in the string, | |||
| 100 | after replacing the token itself with a NUL wide character (L'\e0'). | 100 | after replacing the token itself with a NUL wide character (L'\e0'). |
| 101 | When no more tokens remain, a null pointer is returned. | 101 | When no more tokens remain, a null pointer is returned. |
| 102 | .Sh EXAMPLES | 102 | .Sh EXAMPLES |
| 103 | The following code fragment splits a wide character string on | 103 | The following code fragment splits a wide-character string on |
| 104 | .Tn ASCII | 104 | .Tn ASCII |
| 105 | space, tab, and newline characters and writes the tokens to | 105 | space, tab, and newline characters and writes the tokens to |
| 106 | standard output: | 106 | standard output: |
diff --git a/src/lib/libc/string/wmemchr.3 b/src/lib/libc/string/wmemchr.3 index 395488829d..ff82c7b530 100644 --- a/src/lib/libc/string/wmemchr.3 +++ b/src/lib/libc/string/wmemchr.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: wmemchr.3,v 1.3 2007/05/31 19:19:32 jmc Exp $ | 1 | .\" $OpenBSD: wmemchr.3,v 1.4 2010/09/10 18:38:20 jmc Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" $NetBSD: wmemchr.3,v 1.9 2003/09/08 17:54:33 wiz Exp $ | 3 | .\" $NetBSD: wmemchr.3,v 1.9 2003/09/08 17:54:33 wiz Exp $ |
| 4 | .\" | 4 | .\" |
| @@ -35,7 +35,7 @@ | |||
| 35 | .\" | 35 | .\" |
| 36 | .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 | 36 | .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 |
| 37 | .\" | 37 | .\" |
| 38 | .Dd $Mdocdate: May 31 2007 $ | 38 | .Dd $Mdocdate: September 10 2010 $ |
| 39 | .Dt WMEMCHR 3 | 39 | .Dt WMEMCHR 3 |
| 40 | .Os | 40 | .Os |
| 41 | .Sh NAME | 41 | .Sh NAME |
| @@ -59,7 +59,7 @@ | |||
| 59 | .Nm wcsrchr , | 59 | .Nm wcsrchr , |
| 60 | .Nm wcsspn , | 60 | .Nm wcsspn , |
| 61 | .Nm wcsstr | 61 | .Nm wcsstr |
| 62 | .Nd wide character string manipulation operations | 62 | .Nd wide-character string manipulation operations |
| 63 | .Sh SYNOPSIS | 63 | .Sh SYNOPSIS |
| 64 | .In wchar.h | 64 | .In wchar.h |
| 65 | .Ft wchar_t * | 65 | .Ft wchar_t * |
| @@ -103,7 +103,7 @@ | |||
| 103 | .Ft wchar_t * | 103 | .Ft wchar_t * |
| 104 | .Fn wcsstr "const wchar_t *s1" "const wchar_t *s2" | 104 | .Fn wcsstr "const wchar_t *s1" "const wchar_t *s2" |
| 105 | .Sh DESCRIPTION | 105 | .Sh DESCRIPTION |
| 106 | These functions implement string manipulation operations over wide character | 106 | These functions implement string manipulation operations over wide-character |
| 107 | strings. | 107 | strings. |
| 108 | For a detailed description, refer to documents for the respective single-byte | 108 | For a detailed description, refer to documents for the respective single-byte |
| 109 | counterpart, such as | 109 | counterpart, such as |