Cosmetic

src/hb-open-file-private.hh

@@ -100,7 +100,8 @@ typedef struct OffsetTable
   public:
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF () && SANITIZE_ARRAY (tableDir, TableDirectory::get_size (), numTables);
+    return SANITIZE_SELF ()
+	&& SANITIZE_ARRAY (tableDir, TableDirectory::get_size (), numTables);
   }
 
   private:

src/hb-open-type-private.hh

@@ -555,7 +555,8 @@ struct GenericArrayOf
   private:
   inline bool sanitize_shallow (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF() && SANITIZE_ARRAY (this, Type::get_size (), len);
+    return SANITIZE_SELF()
+	&& SANITIZE_ARRAY (this, Type::get_size (), len);
   }
 
   public:
@@ -622,7 +623,8 @@ struct HeadlessArrayOf
   { return len.get_size () + (len ? len - 1 : 0) * Type::get_size (); }
 
   inline bool sanitize_shallow (hb_sanitize_context_t *context) {
-    return SANITIZE_SELF() && SANITIZE_ARRAY (this, Type::get_size (), len);
+    return SANITIZE_SELF()
+	&& SANITIZE_ARRAY (this, Type::get_size (), len);
   }
 
   inline bool sanitize (hb_sanitize_context_t *context) {

src/hb-ot-layout-common-private.hh

@@ -166,7 +166,8 @@ struct LangSys
 
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF () && SANITIZE (featureIndex);
+    return SANITIZE_SELF ()
+	&& SANITIZE (featureIndex);
   }
 
   Offset	lookupOrder;	/* = Null (reserved for an offset to a
@@ -234,7 +235,8 @@ struct Feature
 
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF () && SANITIZE (lookupIndex);
+    return SANITIZE_SELF ()
+	&& SANITIZE (lookupIndex);
   }
 
   /* LONGTERMTODO: implement get_feature_parameters() */
@@ -285,7 +287,8 @@ struct Lookup
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
     /* Real sanitize of the subtables is done by GSUB/GPOS/... */
-    if (!(SANITIZE_SELF () && likely (subTable.sanitize (context)))) return false;
+    if (!(SANITIZE_SELF ()
+       && likely (subTable.sanitize (context)))) return false;
     if (unlikely (lookupFlag & LookupFlag::UseMarkFilteringSet))
     {
       USHORT &markFilteringSet = StructAfter<USHORT> (subTable);
@@ -454,7 +457,8 @@ struct ClassDefFormat1
 
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF () && SANITIZE (classValue);
+    return SANITIZE_SELF ()
+	&& SANITIZE (classValue);
   }
 
   USHORT	classFormat;		/* Format identifier--format = 1 */
@@ -594,7 +598,8 @@ struct Device
 
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE_SELF() && SANITIZE_MEM (this, this->get_size ());
+    return SANITIZE_SELF()
+	&& SANITIZE_MEM (this, this->get_size ());
   }
 
   private:

src/hb-ot-layout-gpos-private.hh

@@ -159,9 +159,8 @@ struct ValueFormat : USHORT
 
   inline bool sanitize_value (hb_sanitize_context_t *context, void *base, const Value *values) {
     TRACE_SANITIZE ();
-
+    return SANITIZE_MEM (values, get_size ())
-    return SANITIZE_MEM (values, get_size ()) &&
+	&& (!has_device () || sanitize_value_devices (context, base, values));
-	   (!has_device () || sanitize_value_devices (context, base, values));
   }
 
   inline bool sanitize_values (hb_sanitize_context_t *context, void *base, const Value *values, unsigned int count) {

src/hb-ot-layout-gsub-private.hh

@@ -428,7 +428,8 @@ struct Ligature
   public:
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    return SANITIZE (ligGlyph) && SANITIZE (component);
+    return SANITIZE (ligGlyph)
+        && SANITIZE (component);
   }
 
   private:

src/hb-ot-layout-gsubgpos-private.hh

@@ -287,8 +287,9 @@ struct Rule
   public:
   inline bool sanitize (hb_sanitize_context_t *context) {
     TRACE_SANITIZE ();
-    if (!(SANITIZE (inputCount) && SANITIZE (lookupCount))) return false;
+    return SANITIZE (inputCount)
-    return SANITIZE_MEM (input,
+	&& SANITIZE (lookupCount)
+	&& SANITIZE_MEM (input,
 			 input[0].get_size () * inputCount +
 			 lookupRecordX[0].get_size () * lookupCount);
   }
@@ -444,10 +445,10 @@ struct ContextFormat3
     TRACE_SANITIZE ();
     if (!SANITIZE_SELF ()) return false;
     unsigned int count = glyphCount;
-    if (!SANITIZE_ARRAY (coverage, OffsetTo<Coverage>::get_size (), glyphCount)) return false;
+    if (!SANITIZE_ARRAY (coverage, OffsetTo<Coverage>::get_size (), count)) return false;
     for (unsigned int i = 0; i < count; i++)
       if (!SANITIZE_WITH_BASE (this, coverage[i])) return false;
-    LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, OffsetTo<Coverage>::get_size () * glyphCount);
+    LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, OffsetTo<Coverage>::get_size () * count);
     return SANITIZE_ARRAY (lookupRecord, LookupRecord::get_size (), lookupCount);
   }