Commit fc9f706e authored by Akira TAGOH's avatar Akira TAGOH

Add some debugging output

parent cb1df8cb
...@@ -150,17 +150,20 @@ static const char bin2hex[] = { '0', '1', '2', '3', ...@@ -150,17 +150,20 @@ static const char bin2hex[] = { '0', '1', '2', '3',
static FcChar8 * static FcChar8 *
FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[CACHEBASE_LEN]) FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[CACHEBASE_LEN])
{ {
FcChar8 *new_dir; FcChar8 *new_dir = NULL;
unsigned char hash[16]; unsigned char hash[16];
FcChar8 *hex_hash, *key = NULL; FcChar8 *hex_hash, *key = NULL;
int cnt; int cnt;
struct MD5Context ctx; struct MD5Context ctx;
const FcChar8 *salt; const FcChar8 *salt, *orig_dir = NULL;
salt = FcConfigMapSalt (config, dir); salt = FcConfigMapSalt (config, dir);
new_dir = FcConfigMapFontPath(config, dir); new_dir = FcConfigMapFontPath(config, dir);
if (new_dir) if (new_dir)
{
orig_dir = dir;
dir = new_dir; dir = new_dir;
}
if (salt) if (salt)
{ {
size_t dl = strlen ((const char *) dir); size_t dl = strlen ((const char *) dir);
...@@ -169,6 +172,8 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[ ...@@ -169,6 +172,8 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[
key = (FcChar8 *) malloc (dl + sl + 1); key = (FcChar8 *) malloc (dl + sl + 1);
memcpy (key, dir, dl); memcpy (key, dir, dl);
memcpy (key + dl, salt, sl + 1); memcpy (key + dl, salt, sl + 1);
if (!orig_dir)
orig_dir = dir;
dir = key; dir = key;
} }
MD5Init (&ctx); MD5Init (&ctx);
...@@ -176,8 +181,6 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[ ...@@ -176,8 +181,6 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[
MD5Final (hash, &ctx); MD5Final (hash, &ctx);
if (new_dir)
FcStrFree(new_dir);
if (key) if (key)
FcStrFree (key); FcStrFree (key);
...@@ -190,6 +193,13 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[ ...@@ -190,6 +193,13 @@ FcDirCacheBasenameMD5 (FcConfig *config, const FcChar8 *dir, FcChar8 cache_base[
} }
hex_hash[2*cnt] = 0; hex_hash[2*cnt] = 0;
strcat ((char *) cache_base, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX); strcat ((char *) cache_base, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX);
if (FcDebug() & FC_DBG_CACHE)
{
printf ("cache: %s (dir: %s%s%s%s, salt: %s)\n", cache_base, orig_dir ? orig_dir : dir, new_dir ? " (mapped to " : "", new_dir ? (char *)new_dir : "", new_dir ? ")" : "", salt);
}
if (new_dir)
FcStrFree(new_dir);
return cache_base; return cache_base;
} }
......
...@@ -552,12 +552,27 @@ FcConfigAddFontDir (FcConfig *config, ...@@ -552,12 +552,27 @@ FcConfigAddFontDir (FcConfig *config,
const FcChar8 *m, const FcChar8 *m,
const FcChar8 *salt) const FcChar8 *salt)
{ {
if (FcDebug() & FC_DBG_CACHE)
{
if (m)
{
printf ("%s -> %s (salt: %s)\n", d, m, salt);
}
else if (salt)
{
printf ("%s (salt: %s)\n", d, salt);
}
}
return FcStrSetAddFilenamePairWithSalt (config->fontDirs, d, m, salt); return FcStrSetAddFilenamePairWithSalt (config->fontDirs, d, m, salt);
} }
FcBool FcBool
FcConfigResetFontDirs (FcConfig *config) FcConfigResetFontDirs (FcConfig *config)
{ {
if (FcDebug() & FC_DBG_CACHE)
{
printf ("Reset font directories!\n");
}
return FcStrSetDeleteAll (config->fontDirs); return FcStrSetDeleteAll (config->fontDirs);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment