---
x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/x.c b/x.c
index 9126e07..ed734e2 100644
--- a/x.c
+++ b/x.c
@@ -834,7 +834,7 @@ int
xloadfont(Font *f, FcPattern *pattern)
{
FcPattern *configured;
- FcPattern *match;
+ FcPattern *matchFound;
FcResult result;
XGlyphInfo extents;
int wantattr, haveattr;
@@ -851,15 +851,15 @@ xloadfont(Font *f, FcPattern *pattern)
FcConfigSubstitute(NULL, configured, FcMatchPattern);
XftDefaultSubstitute(xw.dpy, xw.scr, configured);
- match = FcFontMatch(NULL, configured, &result);
- if (!match) {
+ matchFound = FcFontMatch(NULL, configured, &result);
+ if (!matchFound) {
FcPatternDestroy(configured);
return 1;
}
- if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+ if (!(f->match = XftFontOpenPattern(xw.dpy, matchFound))) {
FcPatternDestroy(configured);
- FcPatternDestroy(match);
+ FcPatternDestroy(matchFound);
return 1;
}
--
2.20.1- [hackers] [st][PATCH 21/24] avoid unnecessarily linking... Oliver Galvin
- Re: [hackers] [st][PATCH 21/24] avoid unnecessaril... Stephen Gregoratto
- [hackers] [st][PATCH 14/24] now st can build without er... Oliver Galvin
- Re: [hackers] [st][PATCH 14/24] now st can build w... Quentin Rameau
- [hackers] [st][PATCH 05/24] avoid warnings from -Wunuse... Oliver Galvin
- [hackers] [st][PATCH 10/24] fix -Wshadow warnings, due ... Oliver Galvin
- [hackers] [st][PATCH 23/24] stylistic stuff: Tidy up in... Oliver Galvin
- [hackers] [st][PATCH 09/24] avoid redundant declaration... Oliver Galvin
- [hackers] [st][PATCH 12/24] fix remaining cppcheck warn... Oliver Galvin
- [hackers] [st][PATCH 18/24] use compiler attribute to c... Oliver Galvin
- [hackers] [st][PATCH 11/24] rename variable to fix cppc... Oliver Galvin
- [hackers] [st][PATCH 20/24] use EXIT_FAILURE/SUCCESS on... Oliver Galvin
- Re: [hackers] [st][PATCH 20/24] use EXIT_FAILURE/S... Laslo Hunhold
- [hackers] [st][PATCH 24/24] link with librt on non-open... Oliver Galvin
- Re: [hackers] [st][PATCH 24/24] link with librt on... David Phillips
- [hackers] [st][PATCH 15/24] update config.def.h with ne... Oliver Galvin
- [hackers] [st][PATCH 13/24] clean up two warnings from ... Oliver Galvin
- [hackers] [st][PATCH 16/24] avoid leaking memory when x... Oliver Galvin
- [hackers] [st][PATCH 17/24] use EXIT_SUCCESS/FAILURE Oliver Galvin
- [hackers] [st][PATCH 08/24] fix warnings from -Wsign-co... Oliver Galvin
- [hackers] [st][PATCH 04/24] use const where possible, a... Oliver Galvin
