[HB] Fix warnings

This commit is contained in:
Behdad Esfahbod 2009-08-04 21:42:23 -04:00
parent 5ff4e13143
commit 9bd629ccd0
3 changed files with 7 additions and 2 deletions

View File

@ -82,6 +82,7 @@ typedef struct OffsetTable
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (!SANITIZE_BASE (tableDir[i], base)) if (!SANITIZE_BASE (tableDir[i], base))
return false; return false;
return true;
} }
private: private:

View File

@ -484,6 +484,7 @@ struct GenericArrayOf
if (!SANITIZE (array[i])) if (!SANITIZE (array[i]))
return false; return false;
*/ */
return true;
} }
inline bool sanitize (SANITIZE_ARG_DEF, const void *base) { inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
if (!SANITIZE_GET_SIZE()) return false; if (!SANITIZE_GET_SIZE()) return false;
@ -491,6 +492,7 @@ struct GenericArrayOf
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (!array[i].sanitize (SANITIZE_ARG, base)) if (!array[i].sanitize (SANITIZE_ARG, base))
return false; return false;
return true;
} }
inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) { inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
if (!SANITIZE_GET_SIZE()) return false; if (!SANITIZE_GET_SIZE()) return false;
@ -498,6 +500,7 @@ struct GenericArrayOf
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (!array[i].sanitize (SANITIZE_ARG, base, base2)) if (!array[i].sanitize (SANITIZE_ARG, base, base2))
return false; return false;
return true;
} }
inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) { inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
if (!SANITIZE_GET_SIZE()) return false; if (!SANITIZE_GET_SIZE()) return false;
@ -505,6 +508,7 @@ struct GenericArrayOf
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (!array[i].sanitize (SANITIZE_ARG, base, user_data)) if (!array[i].sanitize (SANITIZE_ARG, base, user_data))
return false; return false;
return true;
} }
LenType len; LenType len;
@ -552,6 +556,7 @@ struct HeadlessArrayOf
if (!SANITIZE (array[i])) if (!SANITIZE (array[i]))
return false; return false;
*/ */
return true;
} }
USHORT len; USHORT len;

View File

@ -592,8 +592,7 @@ struct ReverseChainSingleSubstFormat1
if (!SANITIZE_THIS (lookahead)) if (!SANITIZE_THIS (lookahead))
return false; return false;
ArrayOf<GlyphID> &substitute = CAST (ArrayOf<GlyphID>, lookahead, lookahead.get_size ()); ArrayOf<GlyphID> &substitute = CAST (ArrayOf<GlyphID>, lookahead, lookahead.get_size ());
if (!SANITIZE (substitute)) return SANITIZE (substitute);
return false;
} }
private: private: