From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lHd9B-0006ru-FW for mharc-grub-devel@gnu.org; Wed, 03 Mar 2021 20:51:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHd99-0006rZ-V2 for grub-devel@gnu.org; Wed, 03 Mar 2021 20:51:24 -0500 Received: from mail-ot1-x32f.google.com ([2607:f8b0:4864:20::32f]:34286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHd97-00080T-6D for grub-devel@gnu.org; Wed, 03 Mar 2021 20:51:23 -0500 Received: by mail-ot1-x32f.google.com with SMTP id h10so15029167otm.1 for ; Wed, 03 Mar 2021 17:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vdyb19ud5dEnU6EvO3BTa0H3GUicQ0Txkvw77wlEu/U=; b=h1pmsSaCWl2QsI5gh6CrZ54mtCOrcbacgMMVoVUtu5r31ZfOEmKb8V+URriqlkhuH8 BLwqqjVbaoiapXj84JqWmTpXjOdVjZMUZnGvcPGP+cCL/Dmr9RPxRP3C9OX7Qrx5daNN P68TQu68r4X1KYv7ODQhbA3A0IbKhn6ubDiNvtTnDJpBvcAjo6fwX8bhGatJ8IMa83Zn xgFYqDY4XmgmxnfdYYW49CGZZBKq4NLRgybO0cya1Ox3AjXEjY4KPPCqzUg1AkZcDu7u PRYV2j7gEgMxbamt9xZDbAuMdGx+8CsCPKAWgY3zrxGsY/kCOBEnfvYS/vOjpsO6PzVR 26bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Vdyb19ud5dEnU6EvO3BTa0H3GUicQ0Txkvw77wlEu/U=; b=ANdxUBtpf82UXzh+k1UKHsJaem4V0nJ3mHds92Y0dDudLSmGHDGTUNPxgLi95vk3V3 xU3thIRIcg73fEPXc0Cs+CR/vk1hsC1vPaYsimWI9oyfh7ta9ThIwLvbKCR6iyXKksdU Yw+dbzpubuKqw0p3IAcv8TYbt5ehtnGXyElnCGT/WlXCMWpmGSUQ1v+3jn3f6ik25+kn FUOisJwTtDL4HGiAnlRzuU13nkxaMaRvkmUf/B21ZgICsLsAIqLMH/g2/rXHg2WEn4jf sBtUlfPnDwfPiZESJurn9G3fiPV8929JAwpQyYhDKPsjDw0EpfyBj2TDDe1YJCRgmDjF aU4g== X-Gm-Message-State: AOAM533Fvo+m3ViqidRHUdunlc6jZpLVg2NRbzpD0hfjTC/A/PVtQ22s Tea3sDBAcu5Nk1Irheua93eKsdx/HYc+DQ== X-Google-Smtp-Source: ABdhPJzRXGIiETPx+ql3RjlGtKsH1HgkEm7EOwLdGlZrc9ws6txLtLhV39r9L6J216O2aATWHpiL+A== X-Received: by 2002:a9d:7f11:: with SMTP id j17mr1660896otq.251.1614822679257; Wed, 03 Mar 2021 17:51:19 -0800 (PST) Received: from localhost.localdomain ([2605:a601:aac5:3700:a76b:9596:1e1a:28ee]) by smtp.gmail.com with ESMTPSA id y11sm4909441oov.9.2021.03.03.17.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 17:51:18 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH] style: Format string macro should have a space between quotes Date: Wed, 3 Mar 2021 19:51:04 -0600 Message-Id: <20210304015104.524019-1-development@efficientek.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::32f; envelope-from=development@efficientek.com; helo=mail-ot1-x32f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 01:51:24 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 38 +++++++++++++++++++------------------- grub-core/fs/xfs.c | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 7460d7b58..125e8609a 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -272,7 +272,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s grub_json_getuint64 (&k->idx, &keyslot, NULL) || grub_json_getchild (&keyslot, &keyslot, 0) || luks2_parse_keyslot (k, &keyslot)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot index %"PRIuGRUB_SIZE, keyslot_json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot index %" PRIuGRUB_SIZE, keyslot_json_idx); /* Get digest that matches the keyslot. */ if (grub_json_getvalue (&digests, root, "digests") || @@ -284,13 +284,13 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s grub_json_getuint64 (&d->idx, &digest, NULL) || grub_json_getchild (&digest, &digest, 0) || luks2_parse_digest (d, &digest)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %"PRIuGRUB_SIZE, json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index %" PRIuGRUB_SIZE, json_idx); if ((d->keyslots & (1 << k->idx))) break; } if (json_idx == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot \"%"PRIuGRUB_UINT64_T"\"", k->idx); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot \"%" PRIuGRUB_UINT64_T "\"", k->idx); /* Get segment that matches the digest. */ if (grub_json_getvalue (&segments, root, "segments") || @@ -302,13 +302,13 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub_luks2_s grub_json_getuint64 (&s->idx, &segment, NULL) || grub_json_getchild (&segment, &segment, 0) || luks2_parse_segment (s, &segment)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %"PRIuGRUB_SIZE, json_idx); + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment index %" PRIuGRUB_SIZE, json_idx); if ((d->segments & (1 << s->idx))) break; } if (json_idx == size) - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \"%"PRIuGRUB_UINT64_T"\"", d->idx); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \"%" PRIuGRUB_UINT64_T "\"", d->idx); return GRUB_ERR_NONE; } @@ -623,18 +623,18 @@ luks2_recover_key (grub_disk_t source, if (keyslot.priority == 0) { - grub_dprintf ("luks2", "Ignoring keyslot \"%"PRIuGRUB_UINT64_T"\" due to priority\n", keyslot.idx); + grub_dprintf ("luks2", "Ignoring keyslot \"%" PRIuGRUB_UINT64_T "\" due to priority\n", keyslot.idx); continue; } - grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n", keyslot.idx); + grub_dprintf ("luks2", "Trying keyslot \"%" PRIuGRUB_UINT64_T "\"\n", keyslot.idx); /* Sector size should be one of 512, 1024, 2048, or 4096. */ if (!(segment.sector_size == 512 || segment.sector_size == 1024 || segment.sector_size == 2048 || segment.sector_size == 4096)) { - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" sector" - " size %"PRIuGRUB_UINT64_T" is not one of" + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" sector" + " size %" PRIuGRUB_UINT64_T " is not one of" " 512, 1024, 2048, or 4096\n", segment.idx, segment.sector_size); continue; @@ -650,9 +650,9 @@ luks2_recover_key (grub_disk_t source, if (max_crypt_sectors < crypt->offset_sectors) { - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" has offset" - " %"PRIuGRUB_UINT64_T" which is greater than" - " source disk size %"PRIuGRUB_UINT64_T"," + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" has offset" + " %" PRIuGRUB_UINT64_T " which is greater than" + " source disk size %" PRIuGRUB_UINT64_T "," " skipping\n", segment.idx, crypt->offset_sectors, max_crypt_sectors); continue; @@ -675,7 +675,7 @@ luks2_recover_key (grub_disk_t source, } else if (grub_errno == GRUB_ERR_BAD_NUMBER) { - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" size" + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" size" " \"%s\" is not a parsable number," " skipping keyslot\n", segment.idx, segment.size); @@ -691,7 +691,7 @@ luks2_recover_key (grub_disk_t source, * its very unlikely one would be booting from such a large drive * anyway. Use another smaller LUKS2 boot device. */ - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" size" + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" size" " %s overflowed 64-bit unsigned integer," " skipping keyslot\n", segment.idx, segment.size); continue; @@ -700,13 +700,13 @@ luks2_recover_key (grub_disk_t source, if (crypt->total_sectors == 0) { - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" has zero" + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" has zero" " sectors, skipping\n", segment.idx); continue; } else if (max_crypt_sectors < (crypt->offset_sectors + crypt->total_sectors)) { - grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" has last" + grub_dprintf ("luks2", "Segment \"%" PRIuGRUB_UINT64_T "\" has last" " data position greater than source disk size," " the end of the crypto device will be" " inaccessible\n", segment.idx); @@ -719,7 +719,7 @@ luks2_recover_key (grub_disk_t source, (const grub_uint8_t *) passphrase, grub_strlen (passphrase)); if (ret) { - grub_dprintf ("luks2", "Decryption with keyslot \"%"PRIuGRUB_UINT64_T"\" failed: %s\n", + grub_dprintf ("luks2", "Decryption with keyslot \"%" PRIuGRUB_UINT64_T "\" failed: %s\n", keyslot.idx, grub_errmsg); continue; } @@ -727,7 +727,7 @@ luks2_recover_key (grub_disk_t source, ret = luks2_verify_key (&digest, candidate_key, keyslot.key_size); if (ret) { - grub_dprintf ("luks2", "Could not open keyslot \"%"PRIuGRUB_UINT64_T"\": %s\n", + grub_dprintf ("luks2", "Could not open keyslot \"%" PRIuGRUB_UINT64_T "\": %s\n", keyslot.idx, grub_errmsg); continue; } @@ -736,7 +736,7 @@ luks2_recover_key (grub_disk_t source, * TRANSLATORS: It's a cryptographic key slot: one element of an array * where each element is either empty or holds a key. */ - grub_printf_ (N_("Slot \"%"PRIuGRUB_UINT64_T"\" opened\n"), keyslot.idx); + grub_printf_ (N_("Slot \"%" PRIuGRUB_UINT64_T "\" opened\n"), keyslot.idx); candidate_key_len = keyslot.key_size; break; diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c index ea6590290..43023e03f 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c @@ -490,7 +490,7 @@ grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino, grub_uint64_t block = grub_xfs_inode_block (data, ino); int offset = grub_xfs_inode_offset (data, ino); - grub_dprintf("xfs", "Reading inode (%"PRIuGRUB_UINT64_T") - %"PRIuGRUB_UINT64_T", %d\n", + grub_dprintf("xfs", "Reading inode (%" PRIuGRUB_UINT64_T ") - %" PRIuGRUB_UINT64_T ", %d\n", ino, block, offset); /* Read the inode. */ if (grub_disk_read (data->disk, block, offset, grub_xfs_inode_size(data), @@ -934,7 +934,7 @@ grub_xfs_mount (grub_disk_t disk) data->disk = disk; data->pos = 0; - grub_dprintf("xfs", "Reading root ino %"PRIuGRUB_UINT64_T"\n", + grub_dprintf("xfs", "Reading root ino %" PRIuGRUB_UINT64_T "\n", grub_cpu_to_be64(data->sblock.rootino)); grub_xfs_read_inode (data, data->diropen.ino, &data->diropen.inode); -- 2.27.0