From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lHcoZ-0006Vt-3t for mharc-grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHcoU-0006TB-8n for grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:03 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:39826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHcoQ-0001iq-Ig for grub-devel@gnu.org; Wed, 03 Mar 2021 20:30:01 -0500 Received: by mail-pg1-x536.google.com with SMTP id x29so9491099pgk.6 for ; Wed, 03 Mar 2021 17:29:57 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mjrmwq/NgFo2GSoOf3igHIU/Ahma/LntloZ61FwALzE=; b=0Ux3rJH0GpJNmOG2yAT4IxoEnbS8hWLVV4EsdhM3r3DMvsg5ms5kL+f4ELfar4SpKp b5pV2n1cBh3wnB8X+XK4gtG9/91HCnHx1ALo9RvuQw6vZ8VK6NPIUImrWNlUVlQecxeR 6gEmmxkN6KpXi7HQsnB1uAQUHkZTZNn2niz4is8N6+Av/YiGBh38TXxXJPPGXcPBxHrs S/KRLJkq16QwRi5S3pwd1kaAq0Hja99tXJwRkLoLBUqHd6tFD0FvsLgHVFh/n+5OIhRb 82Ng6A+x8j9zcyM41LNuGnZMeKNIViNVyBvIm9NLt28IK7PlGfpd3hVblbfDic3QTSBN 3HHQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mjrmwq/NgFo2GSoOf3igHIU/Ahma/LntloZ61FwALzE=; b=ZHqGg9trNBlQ5sBtZmCpQSn1GnD25JbcfccXRjDfOS6j2hPf6beJURD7PWIZkjIs37 OzHTWfrAj4Y6gExT8A93huus97zK1zizQgVQR5+jBOTZIlL4AFvUUpc6Sb2bQ+td2q3c UCOmscVp5XXl15wNnsL8IF3RenNr7qmliH60qBk/dzdMaVxtzdI2G54aUBqU4WFC4x+q zmdrJxQTxkKO8Rd5U1yEFNZiUWLr5OGS0egOA2f3EPfKi5FCzuFd94SI1qhsxxQX7CE3 yXoA67YWP35R5lEV1dXzSSzWOCiVFh3N76V+pzCeBa9zUzVVwpYWph1d3pdkv4PQFxPv HtIw== X-Gm-Message-State: AOAM5337VEWSK09U9fCdwXUiIKMKTatyWwYn9jUQzTeCV3R9RDUxns8/ hLTdAKMg3EPU9HdMEmmc5Au0ChgIeDImHw== X-Google-Smtp-Source: ABdhPJybzqBchW4Dxc9Ec6N7Ctqlj/PUQH7QQhso0/5nQCwiOiFQ8GrKGp8sKu15nzNlFAJ5jUSqeQ== X-Received: by 2002:a63:5c23:: with SMTP id q35mr1570842pgb.418.1614821395983; Wed, 03 Mar 2021 17:29:55 -0800 (PST) Received: from localhost.localdomain ([2605:a601:aac5:3700:a76b:9596:1e1a:28ee]) by smtp.gmail.com with ESMTPSA id c193sm318190pfc.180.2021.03.03.17.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 17:29:55 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH v5 05/13] grub_error: Use format code PRIuGRUB_SIZE for variables of type grub_size_t Date: Wed, 3 Mar 2021 19:29:10 -0600 Message-Id: <3e64e5cb2aaadd3af88288c427206d7b5764fcda.1614820843.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=development@efficientek.com; helo=mail-pg1-x536.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:30:04 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 12 ++++++++---- grub-core/kern/efi/efi.c | 2 +- grub-core/loader/efi/chainloader.c | 2 +- grub-core/loader/i386/bsd.c | 3 ++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index b62835acc..4ff6654a0 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -484,13 +484,15 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, cons } if (cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES) { - ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Unsupported XTS block size: %d", + ret = grub_error (GRUB_ERR_BAD_ARGUMENT, + "Unsupported XTS block size: %"PRIuGRUB_SIZE, cipher->cipher->blocksize); goto err; } if (secondary_cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES) { - ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Unsupported XTS block size: %d", + ret = grub_error (GRUB_ERR_BAD_ARGUMENT, + "Unsupported XTS block size: %"PRIuGRUB_SIZE, secondary_cipher->cipher->blocksize); goto err; } @@ -501,7 +503,8 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, cons cipheriv = ciphermode + sizeof ("lrw-") - 1; if (cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES) { - ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Unsupported LRW block size: %d", + ret = grub_error (GRUB_ERR_BAD_ARGUMENT, + "Unsupported LRW block size: %"PRIuGRUB_SIZE, cipher->cipher->blocksize); goto err; } @@ -523,7 +526,8 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, cons { if (cipher->cipher->blocksize & (cipher->cipher->blocksize - 1) || cipher->cipher->blocksize == 0) - grub_error (GRUB_ERR_BAD_ARGUMENT, "Unsupported benbi blocksize: %d", + grub_error (GRUB_ERR_BAD_ARGUMENT, + "Unsupported benbi blocksize: %"PRIuGRUB_SIZE, cipher->cipher->blocksize); /* FIXME should we return an error here? */ for (benbi_log = 0; diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c index 2942b8e35..d45cf67a9 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -503,7 +503,7 @@ grub_efi_duplicate_device_path (const grub_efi_device_path_t *dp) if (len < 4) { grub_error (GRUB_ERR_OUT_OF_RANGE, - "malformed EFI Device Path node has length=%d", len); + "malformed EFI Device Path node has length=%"PRIuGRUB_SIZE, len); return NULL; } diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c index 2e98947a0..b8d35f41e 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -164,7 +164,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) if (len < 4) { grub_error (GRUB_ERR_OUT_OF_RANGE, - "malformed EFI Device Path node has length=%d", len); + "malformed EFI Device Path node has length=%"PRIuGRUB_SIZE, len); return NULL; } diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index f5bf7f89e..fe20b339b 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -2110,7 +2110,8 @@ grub_cmd_openbsd_ramdisk (grub_command_t cmd __attribute__ ((unused)), { grub_file_close (file); return grub_error (GRUB_ERR_BAD_OS, "your kOpenBSD supports ramdisk only" - " up to %u bytes, however you supplied a %u bytes one", + " up to %"PRIuGRUB_SIZE" bytes, however you supplied" + " a %"PRIuGRUB_SIZE" bytes one", openbsd_ramdisk.max_size, size); } -- 2.27.0