From f19018da412cf0949748dc8ba80e1a0a376238af Mon Sep 17 00:00:00 2001
From: Simon Cozens <simon@simon-cozens.org>
Date: Thu, 17 Sep 2020 15:08:32 +0100
Subject: [PATCH] Smaller issues from review

---
 src/hb-ot-shape-complex-indic.cc   | 12 ++++++------
 src/hb-ot-shape-complex-myanmar.cc |  2 +-
 src/hb-ot-shape.cc                 |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 1916638c5..b9e013903 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -1006,8 +1006,8 @@ initial_reordering_indic (const hb_ot_shape_plan_t *plan,
 			  hb_font_t *font,
 			  hb_buffer_t *buffer)
 {
-	if (!buffer->message (font, "start reordering indic initial"))
-		return;
+  if (!buffer->message (font, "start reordering indic initial"))
+    return;
   update_consonant_positions_indic (plan, font, buffer);
   insert_dotted_circles_indic (plan, font, buffer);
 
@@ -1488,10 +1488,10 @@ final_reordering_indic (const hb_ot_shape_plan_t *plan,
   unsigned int count = buffer->len;
   if (unlikely (!count)) return;
 
-	if (buffer->message (font, "start reordering indic final")) {
-	  foreach_syllable (buffer, start, end)
-	    final_reordering_syllable_indic (plan, buffer, start, end);
-	  buffer->message (font, "end reordering indic final");
+  if (buffer->message (font, "start reordering indic final")) {
+    foreach_syllable (buffer, start, end)
+      final_reordering_syllable_indic (plan, buffer, start, end);
+    buffer->message (font, "end reordering indic final");
   }
 
   HB_BUFFER_DEALLOCATE_VAR (buffer, indic_category);
diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc
index 0ee0d9e4f..08050380a 100644
--- a/src/hb-ot-shape-complex-myanmar.cc
+++ b/src/hb-ot-shape-complex-myanmar.cc
@@ -332,7 +332,7 @@ reorder_myanmar (const hb_ot_shape_plan_t *plan,
 
     foreach_syllable (buffer, start, end)
       reorder_syllable_myanmar (plan, font->face, buffer, start, end);
-    buffer->message (font, "end reordering myanmar");
+    (void)buffer->message (font, "end reordering myanmar");
   }
 
   HB_BUFFER_DEALLOCATE_VAR (buffer, myanmar_category);
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index cf8110c09..ff92d5dfe 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -851,7 +851,7 @@ hb_ot_substitute_default (const hb_ot_shape_context_t *c)
 
   HB_BUFFER_ALLOCATE_VAR (buffer, glyph_index);
 
-  if (buffer->message(c->font, "begin normalize")) {
+  if (buffer->message(c->font, "start normalize")) {
     _hb_ot_shape_normalize (c->plan, buffer, c->font);
     buffer->message(c->font, "end normalize");
   }
@@ -900,7 +900,7 @@ hb_ot_substitute_post (const hb_ot_shape_context_t *c)
 #endif
 
   if (c->plan->shaper->postprocess_glyphs &&
-    c->buffer->message(c->font, "begin postprocess")) {
+    c->buffer->message(c->font, "start postprocess")) {
     c->plan->shaper->postprocess_glyphs (c->plan, c->buffer, c->font);
     (void)c->buffer->message(c->font, "end postprocess");
   }
@@ -1127,7 +1127,7 @@ hb_ot_shape_internal (hb_ot_shape_context_t *c)
   hb_ensure_native_direction (c->buffer);
 
   if (c->plan->shaper->preprocess_text &&
-    c->buffer->message(c->font, "begin preprocess")) {
+    c->buffer->message(c->font, "start preprocess")) {
     c->plan->shaper->preprocess_text (c->plan, c->buffer, c->font);
     (void)c->buffer->message(c->font, "end preprocess");
   }