commit 47e71d9661946a4ffb96026bf1d697d788414ab5
author Behdad Esfahbod <behdad@behdad.org> Wed Apr 27 16:38:03 2011 -0400
committer Behdad Esfahbod <behdad@behdad.org> Wed Apr 27 16:41:08 2011 -0400
tree df8201e44dfd524e5c03f97a8fcca00e9d474001
parent 8be1420f8fd0e5c53282245d6830efbee5c7409d

[object] Remove unnecessary use of macros

src/hb-blob.cc

diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 7d1925f..435d37b 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -87,7 +87,7 @@
 {
   hb_blob_t *blob;
 
-  if (!length || !HB_OBJECT_DO_CREATE (hb_blob_t, blob)) {
+  if (!length || !(blob = hb_object_create<hb_blob_t> ())) {
     if (destroy)
       destroy (user_data);
     return &_hb_blob_nil;
@@ -122,7 +122,7 @@
   hb_blob_t *blob;
   const char *pdata;
 
-  if (!length || offset >= parent->length || !HB_OBJECT_DO_CREATE (hb_blob_t, blob))
+  if (!length || offset >= parent->length || !(blob = hb_object_create<hb_blob_t> ()))
     return &_hb_blob_nil;
 
   pdata = hb_blob_lock (parent);
@@ -149,13 +149,13 @@
 hb_blob_t *
 hb_blob_reference (hb_blob_t *blob)
 {
-  HB_OBJECT_DO_REFERENCE (blob);
+  return hb_object_reference (blob);
 }
 
 void
 hb_blob_destroy (hb_blob_t *blob)
 {
-  HB_OBJECT_DO_DESTROY (blob);
+  if (!hb_object_destroy (blob)) return;
 
   _hb_blob_destroy_user_data (blob);
 
@@ -171,7 +171,7 @@
 const char *
 hb_blob_lock (hb_blob_t *blob)
 {
-  if (HB_OBJECT_IS_INERT (blob))
+  if (hb_object_is_inert (blob))
     return NULL;
 
   hb_mutex_lock (blob->lock);
@@ -190,7 +190,7 @@
 void
 hb_blob_unlock (hb_blob_t *blob)
 {
-  if (HB_OBJECT_IS_INERT (blob))
+  if (hb_object_is_inert (blob))
     return;
 
   hb_mutex_lock (blob->lock);
@@ -210,7 +210,7 @@
 {
   hb_memory_mode_t mode;
 
-  if (HB_OBJECT_IS_INERT (blob))
+  if (hb_object_is_inert (blob))
     return FALSE;
 
   hb_mutex_lock (blob->lock);
@@ -292,7 +292,7 @@
 {
   hb_memory_mode_t mode;
 
-  if (HB_OBJECT_IS_INERT (blob))
+  if (hb_object_is_inert (blob))
     return FALSE;
 
   hb_mutex_lock (blob->lock);
@@ -312,7 +312,7 @@
 {
   hb_memory_mode_t mode;
 
-  if (HB_OBJECT_IS_INERT (blob))
+  if (hb_object_is_inert (blob))
     return FALSE;
 
   hb_mutex_lock (blob->lock);