From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lCvpU-0006Z9-KV for mharc-grub-devel@gnu.org; Thu, 18 Feb 2021 21:47:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCvpR-0006SB-G6 for grub-devel@gnu.org; Thu, 18 Feb 2021 21:47:37 -0500 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]:33042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCvpF-00007M-6E for grub-devel@gnu.org; Thu, 18 Feb 2021 21:47:37 -0500 Received: by mail-qt1-x829.google.com with SMTP id z6so2480221qts.0 for ; Thu, 18 Feb 2021 18:47:23 -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=b7o5Oz6JvR1iTv9k25vZzDC/PtAz+8lgWgGWsQuKDtBmHkQ7BmUiTWel8f9qN0U8EI 6dnQhqXfiKo6dWHwoml1Nu/Q12BsSYFIY7kUzI1uMb8YFg6ghjmmwr3FtjE2qdwpcgQX Ed17seBZ+P8z+uTRTRsuxR1vK30jIh7n9m/EtbGpi+4Ik20dWhmlYTJYr1jWEi88ZfTC QGXJy3yq2FRHDcJ4CNbNMMmFs3T4YVXtG0snlG5upyrCRU9ppPAllFZKVaTdaWMV16f0 YNmgXkPCiiE0q5hrR3lVj79fB0z8TnahpA/MwU5nGgHQw5obKW1zaLaZJsbOkEmYedL/ fU1g== 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=iikeS7mPh/7/+mSWRBQq5/U+LP4O9ZaLxLjkheK30l9YDF2Klu9qpylfERxl9pO3fR 2qw68mY7hWEZR6ICCI7qgB+jP/M3k9xNipc0cb8fFrPyryU/SVqb5dQLqYyYdqb4cXkf ONvsNmWEgLbHh1sVjsNA7Z1kZevqVIr/ucXFzSgb3hA70k29RlyUgQsYZMsQOihUN2mP j1Jqkb7DaTWBM/UcHA5Ojh33jWLpXWmmy04UgO9W6LZYzkpCLd+uWrdm6/e1+o0mXXf8 CeHMXGROXu+boYIbR1FLsDkHISg6ALocp1DXNC55VhsHfEK6zT8YR1EMSyJJZxDea5Tn ONqw== X-Gm-Message-State: AOAM531JFREt+bmlZtRgAZ7O7xe2KBgfvXNtruUNwZ7/7U9VgM4qEUo5 GlHVaB6OTLYUdFkmMoF6sXdhLv501OFApQ== X-Google-Smtp-Source: ABdhPJxpt3HXHyqaMi6XmGHPBzgYYCqibHnCKor+YHjrYJVh2sTmZq43YrIKaKAJB8CsvdCXwKXhaQ== X-Received: by 2002:ac8:5d09:: with SMTP id f9mr7493425qtx.157.1613702843041; Thu, 18 Feb 2021 18:47:23 -0800 (PST) Received: from localhost.localdomain ([2605:a601:aac5:3700:c323:c101:d96b:34f1]) by smtp.gmail.com with ESMTPSA id y2sm5341515qkj.56.2021.02.18.18.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 18:47:22 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org Cc: Daniel Kiper , Glenn Washburn Subject: [PATCH v4 05/13] grub_error: Use format code PRIuGRUB_SIZE for variables of type grub_size_t Date: Thu, 18 Feb 2021 20:47:06 -0600 Message-Id: <3e64e5cb2aaadd3af88288c427206d7b5764fcda.1613700218.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::829; envelope-from=development@efficientek.com; helo=mail-qt1-x829.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: Fri, 19 Feb 2021 02:47:37 -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