From 4188096a7722f09ffa9319986c0286071da10a27 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 11 Apr 2011 14:58:28 -0400 Subject: [PATCH] Make HB_TAG_CHAR4 private It's just sugar. --- src/hb-common.h | 5 +---- src/hb-private.h | 7 ++++++- test/test-types.c | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hb-common.h b/src/hb-common.h index d46c4a8..a5ebc29 100644 --- a/src/hb-common.h +++ b/src/hb-common.h @@ -55,10 +55,7 @@ typedef int hb_bool_t; typedef uint32_t hb_tag_t; #define HB_TAG(a,b,c,d) ((hb_tag_t)((((uint8_t)(a))<<24)|(((uint8_t)(b))<<16)|(((uint8_t)(c))<<8)|((uint8_t)(d)))) -#define HB_TAG_CHAR4(s) (HB_TAG(((const char *) s)[0], \ - ((const char *) s)[1], \ - ((const char *) s)[2], \ - ((const char *) s)[3])) + #define HB_TAG_NONE HB_TAG(0,0,0,0) hb_tag_t hb_tag_from_string (const char *s); diff --git a/src/hb-private.h b/src/hb-private.h index 481015c..ae10b5d 100644 --- a/src/hb-private.h +++ b/src/hb-private.h @@ -263,12 +263,17 @@ typedef int hb_mutex_t; #define hb_be_uint32_cmp(a,b) (a[0] == b[0] && a[1] == b[1] && a[2] == b[2] && a[3] == b[3]) -/* ASCII character handling */ +/* ASCII tag/character handling */ #define ISALPHA(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) #define TOUPPER(c) (((c) >= 'a' && (c) <= 'z') ? (c) - 'a' + 'A' : (c)) #define TOLOWER(c) (((c) >= 'A' && (c) <= 'Z') ? (c) - 'A' + 'a' : (c)) +#define HB_TAG_CHAR4(s) (HB_TAG(((const char *) s)[0], \ + ((const char *) s)[1], \ + ((const char *) s)[2], \ + ((const char *) s)[3])) + /* Debug */ diff --git a/test/test-types.c b/test/test-types.c index eb13f13..a5cb31a 100644 --- a/test/test-types.c +++ b/test/test-types.c @@ -86,8 +86,6 @@ test_types_tag (void) g_assert_cmphex (HB_TAG ('a','B','c','D'), ==, 0x61426344); - g_assert_cmphex (HB_TAG_CHAR4 ("aBcD"), ==, 0x61426344); - g_assert_cmphex (hb_tag_from_string ("aBcDe"), ==, 0x61426344); g_assert_cmphex (hb_tag_from_string ("aBcD"), ==, 0x61426344); g_assert_cmphex (hb_tag_from_string ("aBc"), ==, 0x61426320); -- 2.7.4