Commit 3a45b8ef authored by Akira TAGOH's avatar Akira TAGOH
Browse files

covscan: fix compiler warnings

parent c44fda28
...@@ -158,11 +158,11 @@ unlink_dirs (const char *dir) ...@@ -158,11 +158,11 @@ unlink_dirs (const char *dir)
int int
main (void) main (void)
{ {
FcChar8 *fontdir = NULL, *cachedir = NULL, *fontname; FcChar8 *fontdir = NULL, *cachedir = NULL;
char *basedir, template[512] = "/tmp/bz106632-XXXXXX"; char *basedir, template[512] = "/tmp/bz106632-XXXXXX";
char cmd[512]; char cmd[512];
FcConfig *config; FcConfig *config;
const FcChar8 *tconf = "<fontconfig>\n" const FcChar8 *tconf = (const FcChar8 *) "<fontconfig>\n"
" <dir>%s</dir>\n" " <dir>%s</dir>\n"
" <cachedir>%s</cachedir>\n" " <cachedir>%s</cachedir>\n"
"</fontconfig>\n"; "</fontconfig>\n";
...@@ -178,21 +178,21 @@ main (void) ...@@ -178,21 +178,21 @@ main (void)
fprintf (stderr, "%s: %s\n", template, strerror (errno)); fprintf (stderr, "%s: %s\n", template, strerror (errno));
goto bail; goto bail;
} }
fontdir = FcStrBuildFilename (basedir, "fonts", NULL); fontdir = FcStrBuildFilename ((const FcChar8 *) basedir, (const FcChar8 *) "fonts", NULL);
cachedir = FcStrBuildFilename (basedir, "cache", NULL); cachedir = FcStrBuildFilename ((const FcChar8 *) basedir, (const FcChar8 *) "cache", NULL);
fprintf (stderr, "D: Creating %s\n", fontdir); fprintf (stderr, "D: Creating %s\n", fontdir);
mkdir_p (fontdir); mkdir_p ((const char *) fontdir);
fprintf (stderr, "D: Creating %s\n", cachedir); fprintf (stderr, "D: Creating %s\n", cachedir);
mkdir_p (cachedir); mkdir_p ((const char *) cachedir);
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir); fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir); snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
system (cmd); (void) system (cmd);
fprintf (stderr, "D: Loading a config\n"); fprintf (stderr, "D: Loading a config\n");
snprintf (conf, 1024, tconf, fontdir, cachedir); snprintf (conf, 1024, (const char *) tconf, fontdir, cachedir);
config = FcConfigCreate (); config = FcConfigCreate ();
if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue)) if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, FcTrue))
{ {
printf ("E: Unable to load config\n"); printf ("E: Unable to load config\n");
ret = 1; ret = 1;
...@@ -216,7 +216,7 @@ main (void) ...@@ -216,7 +216,7 @@ main (void)
} }
fprintf (stderr, "D: Removing %s\n", fontdir); fprintf (stderr, "D: Removing %s\n", fontdir);
snprintf (cmd, 512, "rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S); snprintf (cmd, 512, "rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S);
system (cmd); (void) system (cmd);
fprintf (stderr, "D: Reinitializing\n"); fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
{ {
...@@ -231,7 +231,7 @@ main (void) ...@@ -231,7 +231,7 @@ main (void)
goto bail; goto bail;
} }
config = FcConfigCreate (); config = FcConfigCreate ();
if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue)) if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, FcTrue))
{ {
printf ("E: Unable to load config again\n"); printf ("E: Unable to load config again\n");
ret = 4; ret = 4;
...@@ -255,7 +255,7 @@ main (void) ...@@ -255,7 +255,7 @@ main (void)
} }
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir); fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
snprintf (cmd, 512, "cp -a %s %s; sleep 1", FONTFILE, fontdir); snprintf (cmd, 512, "cp -a %s %s; sleep 1", FONTFILE, fontdir);
system (cmd); (void) system (cmd);
fprintf (stderr, "D: Reinitializing\n"); fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
{ {
...@@ -270,7 +270,7 @@ main (void) ...@@ -270,7 +270,7 @@ main (void)
goto bail; goto bail;
} }
config = FcConfigCreate (); config = FcConfigCreate ();
if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue)) if (!FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) conf, FcTrue))
{ {
printf ("E: Unable to load config again\n"); printf ("E: Unable to load config again\n");
ret = 4; ret = 4;
......
...@@ -45,7 +45,7 @@ fini (Test *test) ...@@ -45,7 +45,7 @@ fini (Test *test)
} }
static FcBool static FcBool
test_add (Test *test, FcChar8 *key, FcBool replace) test_add (Test *test, char *key, FcBool replace)
{ {
uuid_t uuid; uuid_t uuid;
void *u; void *u;
...@@ -68,7 +68,7 @@ test_add (Test *test, FcChar8 *key, FcBool replace) ...@@ -68,7 +68,7 @@ test_add (Test *test, FcChar8 *key, FcBool replace)
} }
static FcBool static FcBool
test_remove (Test *test, FcChar8 *key) test_remove (Test *test, char *key)
{ {
void *u; void *u;
...@@ -87,7 +87,6 @@ int ...@@ -87,7 +87,6 @@ int
main (void) main (void)
{ {
Test *test; Test *test;
uuid_t uuid;
int ret = 0; int ret = 0;
test = init (); test = init ();
......
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