From 860b9997ef6be88bde2071a0307601230fabccbb Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 6 Mar 2023 15:34:58 +0900 Subject: [PATCH] Clean up unused code --- src/fccfg.c | 7 ------- src/fcint.h | 1 - test/test-conf.c | 1 - 3 files changed, 9 deletions(-) diff --git a/src/fccfg.c b/src/fccfg.c index f62e228..655bb99 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -147,10 +147,6 @@ FcConfigCreate (void) if (!config->configDirs) goto bail1; - config->configMapDirs = FcStrSetCreate(); - if (!config->configMapDirs) - goto bail1_5; - config->configFiles = FcStrSetCreate (); if (!config->configFiles) goto bail2; @@ -230,8 +226,6 @@ bail4: bail3: FcStrSetDestroy (config->configFiles); bail2: - FcStrSetDestroy (config->configMapDirs); -bail1_5: FcStrSetDestroy (config->configDirs); bail1: free (config); @@ -370,7 +364,6 @@ FcConfigDestroy (FcConfig *config) (void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL); FcStrSetDestroy (config->configDirs); - FcStrSetDestroy (config->configMapDirs); FcStrSetDestroy (config->fontDirs); FcStrSetDestroy (config->cacheDirs); FcStrSetDestroy (config->configFiles); diff --git a/src/fcint.h b/src/fcint.h index 0c5f5e7..fbf0e81 100644 --- a/src/fcint.h +++ b/src/fcint.h @@ -524,7 +524,6 @@ struct _FcConfig { * and those directives may occur in any order */ FcStrSet *configDirs; /* directories to scan for fonts */ - FcStrSet *configMapDirs; /* mapped names to generate cache entries */ /* * List of directories containing fonts, * built by recursively scanning the set diff --git a/test/test-conf.c b/test/test-conf.c index 1a52c6e..235dce5 100644 --- a/test/test-conf.c +++ b/test/test-conf.c @@ -29,7 +29,6 @@ struct _FcConfig { FcStrSet *configDirs; /* directories to scan for fonts */ - FcStrSet *configMapDirs; FcStrSet *fontDirs; FcStrSet *cacheDirs; FcStrSet *configFiles; /* config files loaded */