From 2fb6295ace36394732815aca5aef1a85e63de56c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 7 Jan 2014 22:15:50 -0800 Subject: Fix unused variable 'dir' warnings catalogue.c: In function 'CatalogueOpenFont': catalogue.c:290:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] catalogue.c: In function 'CatalogueListFonts': catalogue.c:324:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] fpe.c: In function 'BuiltinResetFPE': fpe.c:57:22: warning: variable 'dir' set but not used [-Wunused-but-set-variable] Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre --- src/builtins/fpe.c | 3 --- src/fontfile/catalogue.c | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index 83905da..689f22a 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -54,9 +54,6 @@ BuiltinInitFPE (FontPathElementPtr fpe) static int BuiltinResetFPE (FontPathElementPtr fpe) { - FontDirectoryPtr dir; - - dir = (FontDirectoryPtr) fpe->private; /* builtins can't change! */ return Successful; } diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c index 09ca2ae..6b6fc09 100644 --- a/src/fontfile/catalogue.c +++ b/src/fontfile/catalogue.c @@ -287,7 +287,6 @@ CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, { CataloguePtr cat = fpe->private; FontPathElementPtr subfpe; - FontDirectoryPtr dir; int i, status; CatalogueRescan (fpe, FALSE); @@ -295,7 +294,6 @@ CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, for (i = 0; i < cat->fpeCount; i++) { subfpe = cat->fpeList[i]; - dir = subfpe->private; status = FontFileOpenFont(client, subfpe, flags, name, namelen, format, fmask, id, pFont, aliasName, non_cachable_font); @@ -321,7 +319,6 @@ CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat, { CataloguePtr cat = fpe->private; FontPathElementPtr subfpe; - FontDirectoryPtr dir; int i; CatalogueRescan (fpe, FALSE); @@ -329,7 +326,6 @@ CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat, for (i = 0; i < cat->fpeCount; i++) { subfpe = cat->fpeList[i]; - dir = subfpe->private; FontFileListFonts(client, subfpe, pat, len, max, names); } -- cgit v1.2.3