From d0ad2e0bdb23789c261fe4d8636fb559f04c5f32 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 8 May 2009 16:12:08 +0000 Subject: More tidying svn path=/trunk/tools/ttf2f/; revision=7446 --- src/cli.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/cli.c') diff --git a/src/cli.c b/src/cli.c index 1002a94..c21e759 100644 --- a/src/cli.c +++ b/src/cli.c @@ -27,8 +27,8 @@ int main(int argc, char **argv) int fail; ttf2f_result err = TTF2F_RESULT_OK; int nglyphs; - struct glyph *glist; - struct font_metrics *metrics; + struct glyph *glist = NULL; + struct font_metrics *metrics = NULL; if (argc != 3) { fprintf(stderr, "Usage: %s \n", argv[0]); @@ -36,7 +36,9 @@ int main(int argc, char **argv) } ft_init(); - load_glyph_list(); + + if ((err = glyph_load_list()) != TTF2F_RESULT_OK) + goto error_out; fail = open_font(argv[1]); if (fail) { @@ -122,7 +124,7 @@ error_out: close_font(); ft_fini(); - destroy_glyphs(); + glyph_destroy_list(); exit(err == TTF2F_RESULT_OK ? EXIT_SUCCESS : EXIT_FAILURE); } -- cgit v1.2.3