From c572732f29787d1cf7ff39b8160b3935d4b13ba4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 13 May 2019 15:41:09 -0700
Subject: [PATCH] Fix more excess semi-colon errors

---
 src/hb-common.cc                 | 2 +-
 src/hb-ot-name.cc                | 4 ++--
 src/hb-ot-shape-complex-indic.hh | 2 +-
 src/hb-ot-shape-complex-khmer.hh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 70be6939b..6429b8347 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -67,7 +67,7 @@ _hb_options_init ()
         p = c + strlen (c);
 
 #define OPTION(name, symbol) \
-	if (0 == strncmp (c, name, p - c) && strlen (name) == p - c) u.opts.symbol = true;
+	if (0 == strncmp (c, name, p - c) && strlen (name) == p - c) do { u.opts.symbol = true; } while (0)
 
       OPTION ("uniscribe-bug-compatible", uniscribe_bug_compatible);
       OPTION ("aat", aat);
diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index f7cd427ac..5cd1cc118 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -98,7 +98,7 @@ hb_ot_name_convert_utf (hb_bytes_t                       bytes,
 
       dst = dst_next;
       src = src_next;
-    };
+    }
 
     *text_size = dst - text;
     *dst = 0; /* NUL-terminate. */
@@ -110,7 +110,7 @@ hb_ot_name_convert_utf (hb_bytes_t                       bytes,
   {
     src = in_utf_t::next (src, src_end, &unicode, replacement);
     dst_len += out_utf_t::encode_len (unicode);
-  };
+  }
   return dst_len;
 }
 
diff --git a/src/hb-ot-shape-complex-indic.hh b/src/hb-ot-shape-complex-indic.hh
index 13ab51679..dc8f8c7ce 100644
--- a/src/hb-ot-shape-complex-indic.hh
+++ b/src/hb-ot-shape-complex-indic.hh
@@ -278,7 +278,7 @@ matra_position_indic (hb_codepoint_t u, indic_position_t side)
     case POS_POST_C:	return MATRA_POS_RIGHT (u);
     case POS_ABOVE_C:	return MATRA_POS_TOP (u);
     case POS_BELOW_C:	return MATRA_POS_BOTTOM (u);
-  };
+  }
   return side;
 }
 
diff --git a/src/hb-ot-shape-complex-khmer.hh b/src/hb-ot-shape-complex-khmer.hh
index 622294588..21015c730 100644
--- a/src/hb-ot-shape-complex-khmer.hh
+++ b/src/hb-ot-shape-complex-khmer.hh
@@ -105,7 +105,7 @@ set_khmer_properties (hb_glyph_info_t &info)
       case POS_ABOVE_C:	cat = OT_VAbv; break;
       case POS_POST_C:	cat = OT_VPst; break;
       default: assert (0);
-    };
+    }
 
   info.khmer_category() = cat;
 }