From bca6a9a07f58b96227b99d0df53d3113c075a9ae Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <tkusumi@netbsd.org>
Date: Mon, 19 Jun 2023 00:45:34 -0700
Subject: [PATCH] usr.sbin/makefs/hammer2: Fix minor -Wchar-subscripts warning
 on NetBSD

Also fix local variable name from 6857f034386455e55e5ca87b75b84db5fcc3522e.

--
warning: array subscript has type 'char' [-Wchar-subscripts]
 1694 |  } else if (isdigit(comp_level_str[0])) {
---
 usr.sbin/makefs/hammer2.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr.sbin/makefs/hammer2.c b/usr.sbin/makefs/hammer2.c
index c0f29d5c04..06c66ee850 100644
--- a/usr.sbin/makefs/hammer2.c
+++ b/usr.sbin/makefs/hammer2.c
@@ -1191,7 +1191,7 @@ static int
 trim_char(char *p, char c)
 {
 	char *o, tmp[PATH_MAX];
-	bool prev_was_slash;
+	bool prev_was_c;
 	size_t n;
 	int i;
 
@@ -1200,34 +1200,34 @@ trim_char(char *p, char c)
 		return ENOSPC;
 
 	/* trim consecutive */
-	prev_was_slash = false;
+	prev_was_c = false;
 	o = p;
 	n = strlen(p);
 
 	for (i = 0; i < n; i++) {
 		if (tmp[i] == c) {
-			if (!prev_was_slash)
+			if (!prev_was_c)
 				*p++ = tmp[i];
-			prev_was_slash = true;
+			prev_was_c = true;
 		} else {
 			*p++ = tmp[i];
-			prev_was_slash = false;
+			prev_was_c = false;
 		}
 	}
 	*p = 0;
 	assert(strlen(p) <= strlen(tmp));
 
 	/* assert no consecutive */
-	prev_was_slash = false;
+	prev_was_c = false;
 	p = o;
 	n = strlen(p);
 
 	for (i = 0; i < n; i++) {
 		if (p[i] == c) {
-			assert(!prev_was_slash);
-			prev_was_slash = true;
+			assert(!prev_was_c);
+			prev_was_c = true;
 		} else {
-			prev_was_slash = false;
+			prev_was_c = false;
 		}
 	}
 
@@ -1670,7 +1670,7 @@ hammer2_inode_setcomp(struct m_vnode *dvp, const char *f)
 	/* convert comp_level_str to comp_level_idx */
 	if (comp_level_str == NULL) {
 		comp_level_idx = 0;
-	} else if (isdigit(comp_level_str[0])) {
+	} else if (isdigit((int)comp_level_str[0])) {
 		comp_level_idx = strtol(comp_level_str, NULL, 0);
 	} else if (strcasecmp(comp_level_str, "default") == 0) {
 		comp_level_idx = 0;
@@ -1889,5 +1889,5 @@ unittest_trim_slash(void)
 	assert_trim_slash("//sys//vfs//hammer2//", "sys/vfs/hammer2");
 	assert_trim_slash("///sys///vfs///hammer2///", "sys/vfs/hammer2");
 
-	printf("%s: success\n", __func__);
+	APRINTF("success\n");
 }
-- 
2.11.4.GIT