Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qKPjN-0003LX-FF for mharc-grub-devel@gnu.org; Fri, 14 Jul 2023 16:49:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKPjL-0003L6-0X for grub-devel@gnu.org; Fri, 14 Jul 2023 16:49:35 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qKPjJ-0004ee-Lr for grub-devel@gnu.org; Fri, 14 Jul 2023 16:49:34 -0400 Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-765942d497fso209042485a.1 for ; Fri, 14 Jul 2023 13:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20221208.gappssmtp.com; s=20221208; t=1689367772; x=1691959772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Dmd6C66xNnVAx0oEpNWvihv3kMEp8vzqCqKQVemCM8=; b=Yv9ie/4TIC+Y6dB/2RJP87UG4W8C6BCIM7aTXn8WkqmAANteauh7HPRQ5P01cVm4G+ may31gziBUisglOG+xLb809qt3m+xPaC1ETWVQ8zuUKrt4SHx7VMHXufR3aekzZjNrSo olSpzl0AJS4AyUwTOu3Z1rzUZHfen+akLFGmL5kjHGCUBa9m/yWcEnlStZvO4TszdhBf Y3ctos90+i/RM+BQvYm+gywnKw09vTPgPm4WI2/Epfs2piF5f0i9k9MidV8/tCzVI8r5 SfLM4Kq178kxKZSN1div89X2o0u16/PfGyQp3vzMw1ylN0PWQjceqK1L+oG+fyxkeYXf Hhag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689367772; x=1691959772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Dmd6C66xNnVAx0oEpNWvihv3kMEp8vzqCqKQVemCM8=; b=HmSIqZcw0BkMe7lgYYxOaQcpCcOKcgLy0qpOILdEzTM48UZzgv+vNyPxSd81mBPR7a 2lEpmDLsUNKkY/HY0ovnyxsziCPKN7c1BKM9nOKM8YCc7WJHasY8H3w8y2m644J8E+VG QDhOFTHMKqbIXwrELV4qGAYCUJnCZT69V4BfbABnchyQNejYAw5VMILqJibLNLI5OL2E w/qcqT8V4b1UwS4MyfrHIKZZESFsUQCkDNinGd0pM7FjkCN387SZzGdCadvjtxGhgaiZ XMCZFTLqEw480Up0AL9/RhWasQBLN58b+CwoFTcHJWmtQwdYEY1+uJAmr4xDs7eqzkM5 NRyA== X-Gm-Message-State: ABy/qLZ/9IufEnQdrh6fYjw0sN7FpK+lxeLm2FGpq5ZUsZihuK4/oAQr kg4aZwWzYPkSma27zQngeFhwnjQF1XP9Ko/oahQ8Rw== X-Google-Smtp-Source: APBJJlEzHJSD0vTVE35qN48ocZr6u07Tf3yFQvZU5SUFvpkYub9HaOR21K8ZtckE+JzbECAGy+jpUw== X-Received: by 2002:a05:620a:4091:b0:767:27c8:968d with SMTP id f17-20020a05620a409100b0076727c8968dmr7852349qko.6.1689367772426; Fri, 14 Jul 2023 13:49:32 -0700 (PDT) Received: from localhost.localdomain ([199.58.83.12]) by smtp.gmail.com with ESMTPSA id g2-20020ac87d02000000b0040328b5fbe2sm1426120qtb.58.2023.07.14.13.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 13:49:31 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Patrick Steinhardt , Glenn Washburn Subject: [PATCH v3 1/2] cryptodisk: Optimize luks_script_get Date: Fri, 14 Jul 2023 15:49:17 -0500 Message-Id: <7a32d780a2f7edb84c62c2ee53b223108ae367dd.1689367560.git.development@efficientek.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::72a; envelope-from=development@efficientek.com; helo=mail-qk1-x72a.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2023 20:49:35 -0000 Use the return value of grub_snprintf() to move the string pointer forward, instead of incrementing the string pointer iteratively until a NULL byte is reached. Move the space out of the format string argument, a small optimization, but also makes the spacing clearer. Also, use the new PRIxGRUB_OFFSET instead of PRIuGRUB_UINT64_T to accurately reflect the format string for this type. Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 34b67a705fbc..c62656a0faea 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -1503,9 +1503,8 @@ luks_script_get (grub_size_t *sz) ptr = grub_stpcpy (ptr, "luks_mount "); ptr = grub_stpcpy (ptr, i->uuid); *ptr++ = ' '; - grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset_sectors); - while (*ptr) - ptr++; + ptr += grub_snprintf (ptr, 21, "%" PRIxGRUB_OFFSET, i->offset_sectors); + *ptr++ = ' '; for (iptr = i->cipher->cipher->name; *iptr; iptr++) *ptr++ = grub_tolower (*iptr); switch (i->mode) -- 2.34.1