diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-21 15:38:04 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-02 15:13:17 +0200 |
commit | ff7dad484c512b873b86849068a6c0527c575a2c (patch) | |
tree | 27b8e95d4cfc5b068ff29bd1969554814e1f400d | |
parent | 0bc7a22d9393ee3a806c308e8e1dd387858d44ba (diff) | |
download | systemd-ff7dad484c512b873b86849068a6c0527c575a2c.tar.gz systemd-ff7dad484c512b873b86849068a6c0527c575a2c.tar.bz2 systemd-ff7dad484c512b873b86849068a6c0527c575a2c.zip |
journalctl: move generate_new_id128() to shared
-rw-r--r-- | src/journal/journalctl.c | 32 | ||||
-rw-r--r-- | src/shared/id128-print.c | 37 | ||||
-rw-r--r-- | src/shared/id128-print.h | 5 | ||||
-rw-r--r-- | src/shared/meson.build | 2 |
4 files changed, 46 insertions, 30 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index a9e4af1dd8..3ff4d29664 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -38,6 +38,7 @@ #include "fsprg.h" #include "glob-util.h" #include "hostname-util.h" +#include "id128-print.h" #include "io-util.h" #include "journal-def.h" #include "journal-internal.h" @@ -1007,35 +1008,6 @@ static int parse_argv(int argc, char *argv[]) { return 1; } -static int generate_new_id128(void) { - sd_id128_t id; - int r; - unsigned i; - - r = sd_id128_randomize(&id); - if (r < 0) - return log_error_errno(r, "Failed to generate ID: %m"); - - printf("As string:\n" - SD_ID128_FORMAT_STR "\n\n" - "As UUID:\n" - "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n\n" - "As man:sd-id128(3) macro:\n" - "#define MESSAGE_XYZ SD_ID128_MAKE(", - SD_ID128_FORMAT_VAL(id), - SD_ID128_FORMAT_VAL(id)); - for (i = 0; i < 16; i++) - printf("%02x%s", id.bytes[i], i != 15 ? "," : ""); - fputs(")\n\n", stdout); - - printf("As Python constant:\n" - ">>> import uuid\n" - ">>> MESSAGE_XYZ = uuid.UUID('" SD_ID128_FORMAT_STR "')\n", - SD_ID128_FORMAT_VAL(id)); - - return 0; -} - static int add_matches(sd_journal *j, char **args) { char **i; bool have_term = false; @@ -2092,7 +2064,7 @@ int main(int argc, char *argv[]) { switch (arg_action) { case ACTION_NEW_ID128: - r = generate_new_id128(); + r = id128_generate_new(); goto finish; case ACTION_SETUP_KEYS: diff --git a/src/shared/id128-print.c b/src/shared/id128-print.c new file mode 100644 index 0000000000..212080fbcc --- /dev/null +++ b/src/shared/id128-print.c @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ + +#include <stdio.h> + +#include "sd-id128.h" + +#include "id128-print.h" +#include "log.h" + +int id128_generate_new(void) { + sd_id128_t id; + int r; + unsigned i; + + r = sd_id128_randomize(&id); + if (r < 0) + return log_error_errno(r, "Failed to generate ID: %m"); + + printf("As string:\n" + SD_ID128_FORMAT_STR "\n\n" + "As UUID:\n" + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n\n" + "As man:sd-id128(3) macro:\n" + "#define MESSAGE_XYZ SD_ID128_MAKE(", + SD_ID128_FORMAT_VAL(id), + SD_ID128_FORMAT_VAL(id)); + for (i = 0; i < 16; i++) + printf("%02x%s", id.bytes[i], i != 15 ? "," : ""); + fputs(")\n\n", stdout); + + printf("As Python constant:\n" + ">>> import uuid\n" + ">>> MESSAGE_XYZ = uuid.UUID('" SD_ID128_FORMAT_STR "')\n", + SD_ID128_FORMAT_VAL(id)); + + return 0; +} diff --git a/src/shared/id128-print.h b/src/shared/id128-print.h new file mode 100644 index 0000000000..6b5b331bbf --- /dev/null +++ b/src/shared/id128-print.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ + +#pragma once + +int id128_generate_new(void); diff --git a/src/shared/meson.build b/src/shared/meson.build index 17370f4048..498b73c750 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -44,6 +44,8 @@ shared_sources = files(''' generator.c generator.h gpt.h + id128-print.c + id128-print.h ima-util.c ima-util.h import-util.c |