uuidd: reorder bulk time and random generation code

Write the data and response length values in same close to order they appear
in protocol.  This should make code a little easier to read.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index d0e476e8b1b2c6df643589d903e44496c100c5c4..f14d6a78446d600e33760cc73fcecff40031a08f 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -529,18 +529,19 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
                                num = (sizeof(reply_buf) - sizeof(num)) / UUID_LEN;
                        __uuid_generate_random((unsigned char *) reply_buf +
                                              sizeof(num), &num);
+                       reply_len = sizeof(num) + (UUID_LEN * num);
+                       memcpy(reply_buf, &num, sizeof(num));
                        if (uuidd_cxt->debug) {
                                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) {
+
+                               cp = reply_buf + sizeof(num)
+                               for (i = 0; i < num; i++) {
                                        uuid_unparse((unsigned char *)cp, str);
                                        fprintf(stderr, "\t%s\n", str);
+                                       cp += UUID_LEN;
                                }
                        }
-                       reply_len = (num * UUID_LEN) + sizeof(num);
-                       memcpy(reply_buf, &num, sizeof(num));
                        break;
                default:
                        if (uuidd_cxt->debug)