X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fverity%2Fverity.c;h=c2b84051f65561acbf41adc2a297c9974fa8d811;hb=d0b21614422d7ecd787aeffb894eba1a6973f4fa;hp=5108e9e3dcbcf62d75f65bf427fa2b79e0aae2e3;hpb=a3777a6b2cde2c7133141474dd4c428220a3e9cc;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/lib/verity/verity.c b/lib/verity/verity.c index 5108e9e..c2b8405 100644 --- a/lib/verity/verity.c +++ b/lib/verity/verity.c @@ -35,7 +35,7 @@ #define VERITY_SIGNATURE "verity\0\0" -/* https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity#verity-superblock-format */ +/* http://code.google.com/p/cryptsetup/wiki/DMVerity#Verity_superblock_format */ struct verity_sb { uint8_t signature[8]; /* "verity\0\0" */ uint32_t version; /* superblock version */ @@ -63,11 +63,11 @@ int VERITY_read_sb(struct crypt_device *cd, ssize_t hdr_size = sizeof(struct verity_sb); int devfd = 0, sb_version; - log_dbg("Reading VERITY header of size %zu on device %s, offset %" PRIu64 ".", + log_dbg("Reading VERITY header of size %u on device %s, offset %" PRIu64 ".", sizeof(struct verity_sb), device_path(device), sb_offset); if (params->flags & CRYPT_VERITY_NO_HEADER) { - log_err(cd, _("Verity device %s doesn't use on-disk header.\n"), + log_err(cd, _("Verity device doesn't use on-disk header.\n"), device_path(device)); return -EINVAL; } @@ -159,17 +159,17 @@ int VERITY_write_sb(struct crypt_device *cd, uuid_t uuid; int r, devfd = 0; - log_dbg("Updating VERITY header of size %zu on device %s, offset %" PRIu64 ".", + log_dbg("Updating VERITY header of size %u on device %s, offset %" PRIu64 ".", sizeof(struct verity_sb), device_path(device), sb_offset); if (!uuid_string || uuid_parse(uuid_string, uuid) == -1) { - log_err(cd, _("Wrong VERITY UUID format provided on device %s.\n"), + log_err(cd, _("Wrong VERITY UUID format provided.\n"), device_path(device)); return -EINVAL; } if (params->flags & CRYPT_VERITY_NO_HEADER) { - log_err(cd, _("Verity device %s doesn't use on-disk header.\n"), + log_err(cd, _("Verity device doesn't use on-disk header.\n"), device_path(device)); return -EINVAL; }