ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

uuidd: spell the plural of "UUID" consistently as "UUIDs" 

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
Benno Schulenberg 2010-06-10 14:04:26 +02:00 committed by Karel Zak
parent 4951f9b38f
commit 333ec74962
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc-utils/uuidd.8
View File

@ -27,9 +27,9 @@ uuidd \- UUID generation daemon
The The
.B uuidd .B uuidd
daemon is used by the UUID library to generate daemon is used by the UUID library to generate
universally unique identifiers (UUIDs), especially time-based UUID's universally unique identifiers (UUIDs), especially time-based UUIDs
in a secure and guaranteed-unique fashion, even in the face of large in a secure and guaranteed-unique fashion, even in the face of large
numbers of threads trying to grab UUID's running on different CPU's. numbers of threads trying to grab UUIDs running on different CPUs.
.SH OPTIONS .SH OPTIONS
.TP .TP
.B \-d .B \-d
@ -44,7 +44,7 @@ If a currently uuidd daemon is running, kill it.
When issuing a test request to a running uuidd, request a bulk response When issuing a test request to a running uuidd, request a bulk response
of of
.I number .I number
UUID's. UUIDs.
.TP .TP
.BI \-p " pidfile" .BI \-p " pidfile"
Specify the pathname where the pid file should be written. By default, Specify the pathname where the pid file should be written. By default,

6
misc-utils/uuidd.c
View File

@ -412,7 +412,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
uuid__generate_random((unsigned char *) reply_buf + uuid__generate_random((unsigned char *) reply_buf +
sizeof(num), &num); sizeof(num), &num);
if (debug) { if (debug) {
printf(_("Generated %d UUID's:\n"), num); printf(_("Generated %d UUIDs:\n"), num);
for (i=0, cp=reply_buf+sizeof(num); for (i=0, cp=reply_buf+sizeof(num);
i < num; i++, cp+=16) { i < num; i++, cp+=16) {
uuid_unparse((unsigned char *)cp, str); uuid_unparse((unsigned char *)cp, str);
@ -531,9 +531,9 @@ int main(int argc, char **argv)
uuid_unparse((unsigned char *) buf, str); uuid_unparse((unsigned char *) buf, str);
printf(_("%s and subsequent %d UUID's\n"), str, num); printf(_("%s and subsequent %d UUIDs\n"), str, num);
} else { } else {
printf(_("List of UUID's:\n")); printf(_("List of UUIDs:\n"));
cp = buf + 4; cp = buf + 4;
if (ret != (int) (sizeof(num) + num*sizeof(uu))) if (ret != (int) (sizeof(num) + num*sizeof(uu)))
goto unexpected_size; goto unexpected_size;

4
misc-utils/uuidgen.1
View File

@ -22,9 +22,9 @@ all UUIDs created on the local system,
and among UUIDs created on other systems in the past and among UUIDs created on other systems in the past
and in the future. and in the future.
.PP .PP
There are two types of UUID's which There are two types of UUIDs which
.B uuidgen .B uuidgen
can generate: time-based UUID's and random-based UUID's. By can generate: time-based UUIDs and random-based UUIDs. By
default default
.B uuidgen .B uuidgen
will generate a random-based UUID if a high-quality random number will generate a random-based UUID if a high-quality random number

2
shlibs/uuid/man/uuid_generate.3
View File

@ -59,7 +59,7 @@ a high-quality random number generator (i.e.,
.IR /dev/urandom ) .IR /dev/urandom )
is not available, in which case a pseudo-random is not available, in which case a pseudo-random
generator will be subsituted. Note that the use of a pseudo-random generator will be subsituted. Note that the use of a pseudo-random
generator may compromise the uniqueness of UUID's generator may compromise the uniqueness of UUIDs
generated in this fashion. generated in this fashion.
.sp .sp
The The

4
shlibs/uuid/src/compare.c
View File

@ -1,7 +1,7 @@
/* /*
* compare.c --- compare whether or not two UUID's are the same * compare.c --- compare whether or not two UUIDs are the same
* *
* Returns 0 if the two UUID's are different, and 1 if they are the same. * Returns 0 if the two UUIDs are different, and 1 if they are the same.
* *
* Copyright (C) 1996, 1997 Theodore Ts'o. * Copyright (C) 1996, 1997 Theodore Ts'o.
* *

2
shlibs/uuid/src/pack.c
View File

@ -1,5 +1,5 @@
/* /*
* Internal routine for packing UUID's * Internal routine for packing UUIDs
* *
* Copyright (C) 1996, 1997 Theodore Ts'o. * Copyright (C) 1996, 1997 Theodore Ts'o.
* *