Index: src/cfwarray.c ================================================================== --- src/cfwarray.c +++ src/cfwarray.c @@ -70,11 +70,11 @@ { CFWObject *obj2 = ptr2; CFWArray *array1, *array2; size_t i; - if (obj2->clsptr != cfw_array) + if (obj2->cls != cfw_array) return false; array1 = ptr1; array2 = ptr2; Index: src/cfwobject.c ================================================================== --- src/cfwobject.c +++ src/cfwobject.c @@ -34,11 +34,11 @@ CFWObject *obj; if ((obj = malloc(class->size)) == NULL) return NULL; - obj->clsptr = class; + obj->cls = class; obj->ref_cnt = 1; if (class->ctor != NULL) { va_list args; va_start(args, class); @@ -76,38 +76,38 @@ void cfw_free(void *ptr) { CFWObject *obj = ptr; - if (obj->clsptr->dtor != NULL) - obj->clsptr->dtor(obj); + if (obj->cls->dtor != NULL) + obj->cls->dtor(obj); free(obj); } bool cfw_equal(void *ptr1, void *ptr2) { CFWObject *obj1 = ptr1, *obj2 = ptr2; - if (obj1->clsptr->equal != NULL) { - return obj1->clsptr->equal(obj1, obj2); + if (obj1->cls->equal != NULL) { + return obj1->cls->equal(obj1, obj2); } else return (obj1 == obj2); } void* cfw_copy(void *ptr) { CFWObject *obj = ptr; - if (obj->clsptr->copy != NULL) - return obj->clsptr->copy(obj); + if (obj->cls->copy != NULL) + return obj->cls->copy(obj); else return NULL; } static CFWClass class = { .name = "CFWObject", .size = sizeof(CFWObject), }; CFWClass *cfw_object = &class; Index: src/cfwobject.h ================================================================== --- src/cfwobject.h +++ src/cfwobject.h @@ -28,11 +28,11 @@ #define __CFWOBJECT_H__ #include "cfwclass.h" typedef struct CFWObject { - CFWClass *clsptr; + CFWClass *cls; int ref_cnt; } CFWObject; extern CFWClass *cfw_object; extern void* cfw_new(CFWClass*, ...); Index: src/cfwstring.c ================================================================== --- src/cfwstring.c +++ src/cfwstring.c @@ -68,11 +68,11 @@ equal(void *ptr1, void *ptr2) { CFWObject *obj2 = ptr2; CFWString *str1, *str2; - if (obj2->clsptr != cfw_string) + if (obj2->cls != cfw_string) return false; str1 = ptr1; str2 = ptr2;