From 50295f03b7684e5fb72e3446d0ae3dcf3cacb384 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 4 Aug 2009 21:42:23 -0400 Subject: [HB] Fix warnings --- pango/opentype/hb-open-file-private.hh | 1 + pango/opentype/hb-open-types-private.hh | 5 +++++ pango/opentype/hb-ot-layout-gsub-private.hh | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pango/opentype/hb-open-file-private.hh b/pango/opentype/hb-open-file-private.hh index 5cb09daf..e66b08a0 100644 --- a/pango/opentype/hb-open-file-private.hh +++ b/pango/opentype/hb-open-file-private.hh @@ -82,6 +82,7 @@ typedef struct OffsetTable for (unsigned int i = 0; i < count; i++) if (!SANITIZE_BASE (tableDir[i], base)) return false; + return true; } private: diff --git a/pango/opentype/hb-open-types-private.hh b/pango/opentype/hb-open-types-private.hh index 1af7c08a..05619df3 100644 --- a/pango/opentype/hb-open-types-private.hh +++ b/pango/opentype/hb-open-types-private.hh @@ -484,6 +484,7 @@ struct GenericArrayOf if (!SANITIZE (array[i])) return false; */ + return true; } inline bool sanitize (SANITIZE_ARG_DEF, const void *base) { if (!SANITIZE_GET_SIZE()) return false; @@ -491,6 +492,7 @@ struct GenericArrayOf for (unsigned int i = 0; i < count; i++) if (!array[i].sanitize (SANITIZE_ARG, base)) return false; + return true; } inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) { if (!SANITIZE_GET_SIZE()) return false; @@ -498,6 +500,7 @@ struct GenericArrayOf for (unsigned int i = 0; i < count; i++) if (!array[i].sanitize (SANITIZE_ARG, base, base2)) return false; + return true; } inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) { if (!SANITIZE_GET_SIZE()) return false; @@ -505,6 +508,7 @@ struct GenericArrayOf for (unsigned int i = 0; i < count; i++) if (!array[i].sanitize (SANITIZE_ARG, base, user_data)) return false; + return true; } LenType len; @@ -552,6 +556,7 @@ struct HeadlessArrayOf if (!SANITIZE (array[i])) return false; */ + return true; } USHORT len; diff --git a/pango/opentype/hb-ot-layout-gsub-private.hh b/pango/opentype/hb-ot-layout-gsub-private.hh index 9d35e997..4d21f658 100644 --- a/pango/opentype/hb-ot-layout-gsub-private.hh +++ b/pango/opentype/hb-ot-layout-gsub-private.hh @@ -592,8 +592,7 @@ struct ReverseChainSingleSubstFormat1 if (!SANITIZE_THIS (lookahead)) return false; ArrayOf &substitute = CAST (ArrayOf, lookahead, lookahead.get_size ()); - if (!SANITIZE (substitute)) - return false; + return SANITIZE (substitute); } private: -- cgit v1.2.1