From a03ab7e51a9f2239c698749df401cedf8386e721 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 28 Nov 2021 13:05:36 -0800 Subject: Clear -Wshadow warning from gcc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xlsfonts.c: In function ‘do_query_font’: xlsfonts.c:628:24: warning: declaration of ‘dpy’ shadows a global declaration [-Wshadow] do_query_font(Display *dpy, char *name) ^~~ In file included from xlsfonts.c:37:0: dsimple.h:53:17: note: shadowed declaration is here extern Display *dpy; /* The current display */ ^~~ Signed-off-by: Alan Coopersmith --- xlsfonts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xlsfonts.c b/xlsfonts.c index d5163ae..b834637 100644 --- a/xlsfonts.c +++ b/xlsfonts.c @@ -625,10 +625,10 @@ print_character_metrics(register XFontStruct *info) } static void -do_query_font(Display *dpy, char *name) +do_query_font(Display *display, char *name) { register int i; - register XFontStruct *info = XLoadQueryFont(dpy, name); + register XFontStruct *info = XLoadQueryFont(display, name); if (!info) { fprintf(stderr, "%s: unable to get info about font \"%s\"\n", -- cgit v1.2.3