From 238245cd66e10025316463998a1fa20c15a065a8 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 16 Nov 2021 22:07:28 +0100 Subject: [PATCH] Fix clang++ warnings. * src/*: Initialize some variables to NULL. --- src/base/ftobjs.c | 4 ++-- src/cache/ftcmanag.c | 2 +- src/cache/ftcmru.c | 2 +- src/cff/cffdrivr.c | 12 ++++++------ src/psaux/psstack.c | 4 ++-- src/raster/ftraster.c | 2 +- src/sdf/ftbsdf.c | 2 +- src/sdf/ftsdf.c | 2 +- src/smooth/ftgrays.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 19f794e12..ee5109557 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -3744,7 +3744,7 @@ FT_Error error; FT_Face face; FT_Memory memory; - FT_CMap cmap; + FT_CMap cmap = NULL; if ( !clazz || !charmap || !charmap->face ) @@ -4459,7 +4459,7 @@ FT_Library library = module->library; FT_Memory memory = library->memory; FT_Error error; - FT_ListNode node; + FT_ListNode node = NULL; if ( FT_QNEW( node ) ) diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index b4aee40db..512de8a3f 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -357,7 +357,7 @@ { FT_Error error; FT_Memory memory; - FTC_Manager manager; + FTC_Manager manager = NULL; if ( !library ) diff --git a/src/cache/ftcmru.c b/src/cache/ftcmru.c index 40bbfe181..2cac6f9d3 100644 --- a/src/cache/ftcmru.c +++ b/src/cache/ftcmru.c @@ -237,7 +237,7 @@ FTC_MruNode *anode ) { FT_Error error; - FTC_MruNode node; + FTC_MruNode node = NULL; FT_Memory memory = list->memory; diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index b33435b44..59210f37c 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -473,9 +473,9 @@ if ( cff && !cff->font_info ) { - CFF_FontRecDict dict = &cff->top_font.font_dict; - FT_Memory memory = face->root.memory; - PS_FontInfoRec* font_info; + CFF_FontRecDict dict = &cff->top_font.font_dict; + FT_Memory memory = face->root.memory; + PS_FontInfoRec* font_info = NULL; if ( FT_QNEW( font_info ) ) @@ -517,9 +517,9 @@ if ( cff && !cff->font_extra ) { - CFF_FontRecDict dict = &cff->top_font.font_dict; - FT_Memory memory = face->root.memory; - PS_FontExtraRec* font_extra; + CFF_FontRecDict dict = &cff->top_font.font_dict; + FT_Memory memory = face->root.memory; + PS_FontExtraRec* font_extra = NULL; FT_String* embedded_postscript; diff --git a/src/psaux/psstack.c b/src/psaux/psstack.c index ca8d422e8..797486588 100644 --- a/src/psaux/psstack.c +++ b/src/psaux/psstack.c @@ -54,8 +54,8 @@ FT_Error* e, FT_UInt stackSize ) { - FT_Error error; /* for FT_QNEW */ - CF2_Stack stack; + FT_Error error; /* for FT_QNEW */ + CF2_Stack stack = NULL; if ( FT_QNEW( stack ) ) diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index c886f7e31..bfc059c1e 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -3171,7 +3171,7 @@ black_PRaster *araster ) { FT_Error error; - black_PRaster raster; + black_PRaster raster = NULL; if ( !FT_NEW( raster ) ) diff --git a/src/sdf/ftbsdf.c b/src/sdf/ftbsdf.c index 0f414c85e..8da5c9d9e 100644 --- a/src/sdf/ftbsdf.c +++ b/src/sdf/ftbsdf.c @@ -1177,7 +1177,7 @@ BSDF_PRaster* araster ) { FT_Error error; - BSDF_PRaster raster; + BSDF_PRaster raster = NULL; if ( !FT_NEW( raster ) ) diff --git a/src/sdf/ftsdf.c b/src/sdf/ftsdf.c index 784e24705..f69cf49b4 100644 --- a/src/sdf/ftsdf.c +++ b/src/sdf/ftsdf.c @@ -3710,7 +3710,7 @@ SDF_PRaster* araster ) { FT_Error error; - SDF_PRaster raster; + SDF_PRaster raster = NULL; if ( !FT_NEW( raster ) ) diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 380aea3cb..a6af8b989 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -2151,7 +2151,7 @@ typedef ptrdiff_t FT_PtrDist; gray_PRaster* araster ) { FT_Error error; - gray_PRaster raster; + gray_PRaster raster = NULL; if ( !FT_NEW( raster ) )