From: krw <krw@openbsd.org>
Date: Mon, 19 Jun 2023 23:11:19 +0000 (+0000)
Subject: "%-Ns\n" is more appropriately "%s\n" to avoid adding extraneous
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8f546ed60efe49abbaf558dae51a99582c19cc93;p=openbsd

"%-Ns\n" is more appropriately "%s\n" to avoid adding extraneous
blanks to the end of the line.

Unexpected line wrapping noticed by kettenis@, cause spotted by deraadt@

Nuke an unused variable in passing.
---

diff --git a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c
index ad7f44e497c..65e7e8eeb66 100644
--- a/sbin/fdisk/gpt.c
+++ b/sbin/fdisk/gpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpt.c,v 1.91 2023/05/17 12:59:37 krw Exp $	*/
+/*	$OpenBSD: gpt.c,v 1.92 2023/06/19 23:11:19 krw Exp $	*/
 /*
  * Copyright (c) 2015 Markus Muller <mmu@grummel.net>
  * Copyright (c) 2015 Kenneth R Westerback <krw@openbsd.org>
@@ -455,7 +455,7 @@ GPT_print_part(const unsigned int pn, const char *units, const int verbosity)
 			printf("      <invalid partition guid>             ");
 		else
 			printf("      %-36s ", guidstr);
-		printf("%-36s\n", name_to_string(pn));
+		printf("%s\n", name_to_string(pn));
 		free(guidstr);
 		attrs = gp[pn].gp_attrs;
 		if (attrs) {