From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1f1D4Y-0003Ac-Rs for mharc-grub-devel@gnu.org; Wed, 28 Mar 2018 11:33:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1D4V-00037x-3c for grub-devel@gnu.org; Wed, 28 Mar 2018 11:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1D4T-0007Zq-SW for grub-devel@gnu.org; Wed, 28 Mar 2018 11:33:07 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:35546) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f1D4T-0007Z7-Lz for grub-devel@gnu.org; Wed, 28 Mar 2018 11:33:05 -0400 Received: by mail-pg0-x244.google.com with SMTP id j3so1066447pgf.2 for ; Wed, 28 Mar 2018 08:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=GFoc/TyhG2AGjYrEY9A51Vq67XJvH6/2eUEXD8rsuJM=; b=jDpvjkKyKMeUccqK72Ai2OJ0qC7qQxGnZUkrypz1WP4PqT3euE4TKr0l2KDQvjBh/M VjKBhtnEkWDzhl4tDtKr5CRvZbQuK2mXJCm6qDp0ld7ktSI1FlZiIwhPe0e780yxrKL9 IEuXxKCNs2She3hyMe2TsZognbkbLoBSauA+P9LtNhx51XBq/hya+V+gRHhqo+C7Hk6i cQoWX1TFxChuQXC3Li2PafLzDi6Jl4choiVVvh5otPT6CFin/sJjFMehBUqHZb5Z1FiR Dpe+gM1OoYn8EgyysrFCzy5AcKeXlrRldL7yvlDTi6u0JAPpKLN8jz1AVNH40BJabUSj odXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=GFoc/TyhG2AGjYrEY9A51Vq67XJvH6/2eUEXD8rsuJM=; b=q5CdcTWxkGSXXFmMZ086/5Hxbe5pqPEdW+y4hNP2EeGIZ7rGaTq0sFrnvWVPVP/n23 BMYwDz1DeGCMChmTUKwFojmcQP5H2UrLP74/pDM4cmHVAM3dqg3xpEGVpkfl2JkKu7vi alNFm7QP+rbkN2ZdKevD2IZ0B8tFdppdalfJjPmx4GumuoY/+gMhsyhWiSWBGRhMml6W 28JxI0nP3oJieLpRCff76EbO5Bj1l2x1JJ3sStCnAJCww9Y1dYraemEepWhPPoHjHRoT JIs0E1Jw7w7HzPIvo2Bp3vP5Yu6XpxGA7Yk9qA252HCQm5PXaxxZksiP473cE051L5hG 719A== X-Gm-Message-State: AElRT7HycXu/QjjivM28hjXErpq/JklvKtnIrOcERm27c26yDF9DxZ+z sxz79qgfdT6Vq4QNUEoBADKxSw== X-Google-Smtp-Source: AIpwx48M6QfMblx2F2h6S0QBcTwSuGFVY06wjjuaSAmMbzaNt+8NgmNr8wiLPyN+JuT4xA+MtbFHnA== X-Received: by 10.99.124.92 with SMTP id l28mr2875717pgn.51.1522251184354; Wed, 28 Mar 2018 08:33:04 -0700 (PDT) Received: from localhost.localdomain ([2601:602:9c01:e86a:2ec2:3a19:cd81:76ab]) by smtp.googlemail.com with ESMTPSA id m185sm3887624pfc.88.2018.03.28.08.33.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 08:33:03 -0700 (PDT) From: Nicholas Vinson To: grub-devel@gnu.org Subject: [GRUB PARTUUID PATCH V8 1/4] Centralize guid prints Date: Wed, 28 Mar 2018 08:32:51 -0700 Message-Id: <17b87951ca252bbaacbdca856c7539a7c9197d53.1522249571.git.nvinson234@gmail.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 15:33:08 -0000 Define print_gpt_guid(), so there is a central function for printing GUID strings. This change is a precursor for later patches which rely on this logic. Signed-off-by: Nicholas Vinson Reviewed-by: Daniel Kiper --- util/grub-probe.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/util/grub-probe.c b/util/grub-probe.c index 8ac527d2f..21cb80fbe 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -129,6 +129,20 @@ get_targets_string (void) return str; } +static int +print_gpt_guid (grub_gpt_part_guid_t guid) +{ + guid.data1 = grub_le_to_cpu32 (guid.data1); + guid.data2 = grub_le_to_cpu16 (guid.data2); + guid.data3 = grub_le_to_cpu16 (guid.data3); + + return grub_printf ("%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid.data1, guid.data2, guid.data3, guid.data4[0], + guid.data4[1], guid.data4[2], guid.data4[3], + guid.data4[4], guid.data4[5], guid.data4[6], + guid.data4[7]); +} + static void do_print (const char *x, void *data) { @@ -641,21 +655,7 @@ probe (const char *path, char **device_names, char delim) if (grub_disk_read (dev->disk, p->offset, p->index, sizeof (gptdata), &gptdata) == 0) - { - grub_gpt_part_type_t gpttype; - gpttype.data1 = grub_le_to_cpu32 (gptdata.type.data1); - gpttype.data2 = grub_le_to_cpu16 (gptdata.type.data2); - gpttype.data3 = grub_le_to_cpu16 (gptdata.type.data3); - grub_memcpy (gpttype.data4, gptdata.type.data4, 8); - - grub_printf ("%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - gpttype.data1, gpttype.data2, - gpttype.data3, gpttype.data4[0], - gpttype.data4[1], gpttype.data4[2], - gpttype.data4[3], gpttype.data4[4], - gpttype.data4[5], gpttype.data4[6], - gpttype.data4[7]); - } + print_gpt_guid(gptdata.type); dev->disk->partition = p; } putchar (delim); -- 2.16.3