From bcfbb81b8b3fe6a1d59c2097b4741bd4aae344e4 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 28 Jan 2021 11:12:08 -0500
Subject: Enable -Wshadow by default

And fix the one case it warns on.
---
 Makefile |  2 +-
 eval.c   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index ed793a7..5df2812 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ INSTALL ?= install
 MKDIR ?= mkdir -p
 RM ?= rm -f
 
-DEFAULT_CFLAGS ?= -g -Wall -Wmissing-declarations -Wstrict-prototypes -Wsign-compare
+DEFAULT_CFLAGS ?= -g -Wall -Wmissing-declarations -Wshadow -Wsign-compare -Wstrict-prototypes
 
 CFLAGS ?= $(DEFAULT_CFLAGS)
 LDFLAGS ?=
diff --git a/eval.c b/eval.c
index 6abdaf2..2bcfa8a 100644
--- a/eval.c
+++ b/eval.c
@@ -1098,24 +1098,24 @@ static void eval_status(struct eval_state *state, struct bfs_bar *bar, struct ti
 	while (pathlen > 0) {
 		wchar_t wc;
 		size_t len = mbrtowc(&wc, path, pathlen, &mb);
-		int width;
+		int cwidth;
 		if (len == (size_t)-1) {
-			// Invalid byte sequence, assume a single-width ?
+			// Invalid byte sequence, assume a single-width '?'
 			len = 1;
-			width = 1;
+			cwidth = 1;
 			memset(&mb, 0, sizeof(mb));
 		} else if (len == (size_t)-2) {
-			// Incomplete byte sequence, assume a single-width ?
+			// Incomplete byte sequence, assume a single-width '?'
 			len = pathlen;
-			width = 1;
+			cwidth = 1;
 		} else {
-			width = wcwidth(wc);
-			if (width < 0) {
-				width = 0;
+			cwidth = wcwidth(wc);
+			if (cwidth < 0) {
+				cwidth = 0;
 			}
 		}
 
-		if (pathwidth + width > pathmax) {
+		if (pathwidth + cwidth > pathmax) {
 			break;
 		}
 
@@ -1125,7 +1125,7 @@ static void eval_status(struct eval_state *state, struct bfs_bar *bar, struct ti
 
 		path += len;
 		pathlen -= len;
-		pathwidth += width;
+		pathwidth += cwidth;
 	}
 
 	if (dstrcat(&status, "...") != 0) {
-- 
cgit v1.2.3