[patch] uuidd: fix typo in error message, and improve their consistency

[patch] uuidd: fix typo in error message, and improve their consistency

[Benno Schulenberg]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]


Hi,

Attached patch fixes a typo ("rrror") in a uuidd error message,
adds a word for clarity, removes some periods for consistency,
and adds a period to two informational messages (where others
use a period too).

Regards,

Benno

-- 
http://www.fastmail.fm - Access your email from home and the web


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-textual-fix-typo-in-error-message-and-uniformize-the.patch --]
[-- Type: text/x-patch; name="0001-textual-fix-typo-in-error-message-and-uniformize-the.patch", Size: 2440 bytes --]

From 61af1297d15a060101435fab1bc7b913d69ce144 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 18 May 2013 09:45:11 +0200
Subject: [PATCH] textual: fix typo in error message and uniformize their use of period

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 misc-utils/uuidd.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index b706155..d0ecb95 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -318,7 +318,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 				  sizeof(reply_buf), 0, NULL);
 		if (ret > 0) {
 			if (!uuidd_cxt->quiet)
-				warnx(_("uuidd daemon already running at pid %s"),
+				warnx(_("uuidd daemon is already running at pid %s"),
 				       reply_buf);
 			exit(EXIT_FAILURE);
 		}
@@ -355,7 +355,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 #ifdef USE_SOCKET_ACTIVATION
 	if (uuidd_cxt->no_sock) {
 		if (sd_listen_fds(0) != 1)
-			errx(EXIT_FAILURE, _("no or too many file descriptors received."));
+			errx(EXIT_FAILURE, _("no or too many file descriptors received"));
 
 		s = SD_LISTEN_FDS_START + 0;
 	}
@@ -378,7 +378,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 			if (len < 0)
 				warn(_("read failed"));
 			else
-				warnx(_("rrror reading from client, len = %d"),
+				warnx(_("error reading from client, len = %d"),
 						len);
 			goto shutdown_socket;
 		}
@@ -544,7 +544,7 @@ int main(int argc, char **argv)
 			no_pid = 1;
 #else
 			errx(EXIT_FAILURE, _("uuidd has been built without "
-					     "support for socket activation."));
+					     "support for socket activation"));
 #endif
 			break;
 		case 'q':
@@ -585,7 +585,7 @@ int main(int argc, char **argv)
 	/* custom socket path and socket-activation make no sense */
 	if (s_flag && uuidd_cxt.no_sock && !uuidd_cxt.quiet)
 		warnx(_("Both --socket-activation and --socket specified. "
-			"Ignoring --socket"));
+			"Ignoring --socket."));
 
 	if (num && do_type) {
 		ret = call_daemon(socket_path, do_type + 2, buf,
@@ -641,7 +641,7 @@ int main(int argc, char **argv)
 				return EXIT_FAILURE;
 			}
 			if (!uuidd_cxt.quiet)
-				printf(_("Killed uuidd running at pid %d\n"),
+				printf(_("Killed uuidd running at pid %d.\n"),
 				       do_kill);
 		}
 		return EXIT_SUCCESS;
-- 
1.7.0.4

Re: [patch] uuidd: fix typo in error message, and improve their consistency

[Karel Zak]

On Sat, May 18, 2013 at 09:51:11AM +0200, Benno Schulenberg wrote:
>  misc-utils/uuidd.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com