commit 64d3fc8d0dada673245cc8c0b1c12cd849b30997
author Behdad Esfahbod <behdad@behdad.org> Mon May 03 22:51:19 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon May 03 22:51:19 2010 -0400
tree ed65aceec7fcb982fdec8d89c64bea5f5e15f2cb
parent fa3b3d58443a7c22eca3f86243993ba2d4bd9f4a

Cosmetic: Rename HB_LIKELY/HB_UNLIKELY to likely/unlikely

src/hb-buffer.c

diff --git a/src/hb-buffer.c b/src/hb-buffer.c
index f169c35..adec7c1 100644
--- a/src/hb-buffer.c
+++ b/src/hb-buffer.c
@@ -258,7 +258,7 @@
   buffer->have_output = FALSE;
   buffer->have_positions = TRUE;
 
-  if (HB_UNLIKELY (!buffer->positions))
+  if (unlikely (!buffer->positions))
   {
     buffer->positions = calloc (buffer->allocated, sizeof (buffer->positions[0]));
     return;
@@ -510,7 +510,7 @@
 void
 hb_buffer_reverse (hb_buffer_t *buffer)
 {
-  if (HB_UNLIKELY (!buffer->in_length))
+  if (unlikely (!buffer->in_length))
     return;
 
   reverse_range (buffer, 0, buffer->in_length);
@@ -521,7 +521,7 @@
 {
   unsigned int i, start, count, last_cluster;
 
-  if (HB_UNLIKELY (!buffer->in_length))
+  if (unlikely (!buffer->in_length))
     return;
 
   hb_buffer_reverse (buffer);
@@ -569,7 +569,7 @@
   unsigned int mask, len;
 
   UTF8_COMPUTE (c, mask, len);
-  if (HB_UNLIKELY (!len || (unsigned int) (end - text) < len)) {
+  if (unlikely (!len || (unsigned int) (end - text) < len)) {
     *unicode = -1;
     return text + 1;
   } else {
@@ -578,7 +578,7 @@
     result = c & mask;
     for (i = 1; i < len; i++)
       {
-	if (HB_UNLIKELY ((text[i] & 0xc0) != 0x80))
+	if (unlikely ((text[i] & 0xc0) != 0x80))
 	  {
 	    *unicode = -1;
 	    return text + 1;
@@ -610,10 +610,10 @@
 {
   uint16_t c = *text++;
 
-  if (HB_UNLIKELY (c >= 0xd800 && c < 0xdc00)) {
+  if (unlikely (c >= 0xd800 && c < 0xdc00)) {
     /* high surrogate */
     uint16_t l;
-    if (text < end && ((l = *text), HB_UNLIKELY (l >= 0xdc00 && l < 0xe000))) {
+    if (text < end && ((l = *text), unlikely (l >= 0xdc00 && l < 0xe000))) {
       /* low surrogate */
       *unicode = ((hb_codepoint_t) ((c) - 0xd800) * 0x400 + (l) - 0xdc00 + 0x10000);
        text++;