chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
localectl: fix localectl set-x11-keymap syntax description
[elogind.git]
/
src
/
journal
/
journal-qrcode.c
diff --git
a/src/journal/journal-qrcode.c
b/src/journal/journal-qrcode.c
index b4dab8e86a7d01ccc74b3513b7a328cf62371588..1db66e89c64397c8c36c9f5f0f8ca683e7399370 100644
(file)
--- a/
src/journal/journal-qrcode.c
+++ b/
src/journal/journal-qrcode.c
@@
-46,7
+46,15
@@
static void print_border(FILE *output, unsigned width) {
}
}
}
}
-int print_qr_code(FILE *output, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t mahcine) {
+int print_qr_code(
+ FILE *output,
+ const void *seed,
+ size_t seed_size,
+ uint64_t start,
+ uint64_t interval,
+ const char *hn,
+ sd_id128_t machine) {
+
FILE *f;
char *url = NULL;
size_t url_size = 0, i;
FILE *f;
char *url = NULL;
size_t url_size = 0, i;
@@
-68,10
+76,13
@@
int print_qr_code(FILE *output, const void *seed, size_t seed_size, uint64_t sta
fprintf(f, "%02x", ((uint8_t*) seed)[i]);
}
fprintf(f, "%02x", ((uint8_t*) seed)[i]);
}
- fprintf(f, "/%llx-%llx\n", (unsigned long long) start, (unsigned long long) interval);
+ fprintf(f, "/%"PRIx64"-%"PRIx64"?machine=" SD_ID128_FORMAT_STR,
+ start,
+ interval,
+ SD_ID128_FORMAT_VAL(machine));
if (hn)
if (hn)
- fprintf(f, "
?
hostname=%s", hn);
+ fprintf(f, "
;
hostname=%s", hn);
if (ferror(f)) {
fclose(f);
if (ferror(f)) {
fclose(f);