[PATCH 08/20] uuidd: print all debugging information to stderr

Petr Uzel
2012-03-29T16:45:41Z

misc-utils/uuidd.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index abc24a4..aae5dbf 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -332,7 +332,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
ret = call_daemon(socket_path, UUIDD_OP_GETPID, reply_buf, sizeof(reply_buf), 0, NULL);
if (ret > 0) {
if (!quiet)
- printf(_("uuidd daemon already running at pid %s\n"),
+ fprintf(stderr, _("uuidd daemon already running at pid %s\n"),
reply_buf);
exit(EXIT_FAILURE);
}
@@ -394,7 +394,7 @@ socket_ready:
if (len < 0)
perror("read");
else
- printf(_("Error reading from client, "
+ fprintf(stderr, _("Error reading from client, "
"len = %d\n"), len);
goto shutdown_socket;
}
@@ -403,10 +403,10 @@ socket_ready:
if (read_all(ns, (char *) &num, sizeof(num)) != 4)
goto shutdown_socket;
if (debug)
- printf(_("operation %d, incoming num = %d\n"),
+ fprintf(stderr, _("operation %d, incoming num = %d\n"),
op, num);
} else if (debug)
- printf(_("operation %d\n"), op);
+ fprintf(stderr, _("operation %d\n"), op);

switch (op) {
case UUIDD_OP_GETPID:
@@ -422,7 +422,7 @@ socket_ready:
__uuid_generate_time(uu, &num);
if (debug) {
uuid_unparse(uu, str);
- printf(_("Generated time UUID: %s\n"), str);
+ fprintf(stderr, _("Generated time UUID: %s\n"), str);
}
memcpy(reply_buf, uu, sizeof(uu));
reply_len = sizeof(uu);
@@ -432,7 +432,7 @@ socket_ready:
__uuid_generate_random(uu, &num);
if (debug) {
uuid_unparse(uu, str);
- printf(_("Generated random UUID: %s\n"), str);
+ fprintf(stderr, _("Generated random UUID: %s\n"), str);
}
memcpy(reply_buf, uu, sizeof(uu));
reply_len = sizeof(uu);
@@ -441,10 +441,10 @@ socket_ready:
__uuid_generate_time(uu, &num);
if (debug) {
uuid_unparse(uu, str);
- printf(P_("Generated time UUID %s "
- "and %d following\n",
- "Generated time UUID %s "
- "and %d following\n", num - 1),
+ fprintf(stderr, P_("Generated time UUID %s "
+ "and %d following\n",
+ "Generated time UUID %s "
+ "and %d following\n", num - 1),
str, num - 1);
}
memcpy(reply_buf, uu, sizeof(uu));
@@ -462,13 +462,13 @@ socket_ready:
__uuid_generate_random((unsigned char *) reply_buf +
sizeof(num), &num);
if (debug) {
- printf(P_("Generated %d UUID:\n",
- "Generated %d UUIDs:\n", num), num);
+ fprintf(stderr, P_("Generated %d UUID:\n",
+ "Generated %d UUIDs:\n", num), num);
for (i = 0, cp = reply_buf + sizeof(num);
i < num;
i++, cp += UUID_LEN) {
uuid_unparse((unsigned char *)cp, str);
- printf("\t%s\n", str);
+ fprintf(stderr, "\t%s\n", str);
}
}
reply_len = (num * UUID_LEN) + sizeof(num);
@@ -476,7 +476,7 @@ socket_ready:
break;
default:
if (debug)
- printf(_("Invalid operation %d\n"), op);
+ fprintf(stderr, _("Invalid operation %d\n"), op);
goto shutdown_socket;
}
write_all(ns, (char *) &reply_len, sizeof(reply_len));
--
1.7.7