1 files changed, 36 insertions, 36 deletions

diff --git a/fitz/obj_array.c b/fitz/obj_array.c
index 391c1dd8..d6ffb687 100644
--- a/fitz/obj_array.c
+++ b/fitz/obj_array.c
@@ -1,7 +1,7 @@
 #include "fitz.h"
 
 fz_obj *
-fz_newarray(int initialcap)
+fz_new_array(int initialcap)
 {
 	fz_obj *obj;
 	int i;
@@ -15,56 +15,56 @@ fz_newarray(int initialcap)
 
 	obj->u.a.items = fz_calloc(obj->u.a.cap, sizeof(fz_obj*));
 	for (i = 0; i < obj->u.a.cap; i++)
-		obj->u.a.items[i] = nil;
+		obj->u.a.items[i] = NULL;
 
 	return obj;
 }
 
 fz_obj *
-fz_copyarray(fz_obj *obj)
+fz_copy_array(fz_obj *obj)
 {
 	fz_obj *new;
 	int i;
 
-	if (fz_isindirect(obj) || !fz_isarray(obj))
+	if (fz_is_indirect(obj) || !fz_is_array(obj))
 		fz_warn("assert: not an array (%s)", fz_objkindstr(obj));
 
-	new = fz_newarray(fz_arraylen(obj));
-	for (i = 0; i < fz_arraylen(obj); i++)
-		fz_arraypush(new, fz_arrayget(obj, i));
+	new = fz_new_array(fz_array_len(obj));
+	for (i = 0; i < fz_array_len(obj); i++)
+		fz_array_push(new, fz_array_get(obj, i));
 
 	return new;
 }
 
 int
-fz_arraylen(fz_obj *obj)
+fz_array_len(fz_obj *obj)
 {
-	obj = fz_resolveindirect(obj);
-	if (!fz_isarray(obj))
+	obj = fz_resolve_indirect(obj);
+	if (!fz_is_array(obj))
 		return 0;
 	return obj->u.a.len;
 }
 
 fz_obj *
-fz_arrayget(fz_obj *obj, int i)
+fz_array_get(fz_obj *obj, int i)
 {
-	obj = fz_resolveindirect(obj);
+	obj = fz_resolve_indirect(obj);
 
-	if (!fz_isarray(obj))
-		return nil;
+	if (!fz_is_array(obj))
+		return NULL;
 
 	if (i < 0 || i >= obj->u.a.len)
-		return nil;
+		return NULL;
 
 	return obj->u.a.items[i];
 }
 
 void
-fz_arrayput(fz_obj *obj, int i, fz_obj *item)
+fz_array_put(fz_obj *obj, int i, fz_obj *item)
 {
-	obj = fz_resolveindirect(obj);
+	obj = fz_resolve_indirect(obj);
 
-	if (!fz_isarray(obj))
+	if (!fz_is_array(obj))
 		fz_warn("assert: not an array (%s)", fz_objkindstr(obj));
 	else if (i < 0)
 		fz_warn("assert: index %d < 0", i);
@@ -73,17 +73,17 @@ fz_arrayput(fz_obj *obj, int i, fz_obj *item)
 	else
 	{
 		if (obj->u.a.items[i])
-			fz_dropobj(obj->u.a.items[i]);
-		obj->u.a.items[i] = fz_keepobj(item);
+			fz_drop_obj(obj->u.a.items[i]);
+		obj->u.a.items[i] = fz_keep_obj(item);
 	}
 }
 
 void
-fz_arraypush(fz_obj *obj, fz_obj *item)
+fz_array_push(fz_obj *obj, fz_obj *item)
 {
-	obj = fz_resolveindirect(obj);
+	obj = fz_resolve_indirect(obj);
 
-	if (!fz_isarray(obj))
+	if (!fz_is_array(obj))
 		fz_warn("assert: not an array (%s)", fz_objkindstr(obj));
 	else
 	{
@@ -93,35 +93,35 @@ fz_arraypush(fz_obj *obj, fz_obj *item)
 			obj->u.a.cap = (obj->u.a.cap * 3) / 2;
 			obj->u.a.items = fz_realloc(obj->u.a.items, obj->u.a.cap, sizeof(fz_obj*));
 			for (i = obj->u.a.len ; i < obj->u.a.cap; i++)
-				obj->u.a.items[i] = nil;
+				obj->u.a.items[i] = NULL;
 		}
-		obj->u.a.items[obj->u.a.len] = fz_keepobj(item);
+		obj->u.a.items[obj->u.a.len] = fz_keep_obj(item);
 		obj->u.a.len++;
 	}
 }
 
 void
-fz_arraydrop(fz_obj *obj)
+fz_array_drop(fz_obj *obj)
 {
-	obj = fz_resolveindirect(obj);
+	obj = fz_resolve_indirect(obj);
 
-	if (!fz_isarray(obj))
+	if (!fz_is_array(obj))
 		fz_warn("assert: not an array (%s)", fz_objkindstr(obj));
 	else
 	{
 		if (obj->u.a.len > 0)
 		{
-			fz_dropobj(obj->u.a.items[--obj->u.a.len]);
+			fz_drop_obj(obj->u.a.items[--obj->u.a.len]);
 		}
 	}
 }
 
 void
-fz_arrayinsert(fz_obj *obj, fz_obj *item)
+fz_array_insert(fz_obj *obj, fz_obj *item)
 {
-	obj = fz_resolveindirect(obj);
+	obj = fz_resolve_indirect(obj);
 
-	if (!fz_isarray(obj))
+	if (!fz_is_array(obj))
 		fz_warn("assert: not an array (%s)", fz_objkindstr(obj));
 	else
 	{
@@ -131,16 +131,16 @@ fz_arrayinsert(fz_obj *obj, fz_obj *item)
 			obj->u.a.cap = (obj->u.a.cap * 3) / 2;
 			obj->u.a.items = fz_realloc(obj->u.a.items, obj->u.a.cap, sizeof(fz_obj*));
 			for (i = obj->u.a.len ; i < obj->u.a.cap; i++)
-				obj->u.a.items[i] = nil;
+				obj->u.a.items[i] = NULL;
 		}
 		memmove(obj->u.a.items + 1, obj->u.a.items, obj->u.a.len * sizeof(fz_obj*));
-		obj->u.a.items[0] = fz_keepobj(item);
+		obj->u.a.items[0] = fz_keep_obj(item);
 		obj->u.a.len++;
 	}
 }
 
 void
-fz_freearray(fz_obj *obj)
+fz_free_array(fz_obj *obj)
 {
 	int i;
 
@@ -148,7 +148,7 @@ fz_freearray(fz_obj *obj)
 
 	for (i = 0; i < obj->u.a.len; i++)
 		if (obj->u.a.items[i])
-			fz_dropobj(obj->u.a.items[i]);
+			fz_drop_obj(obj->u.a.items[i]);
 
 	fz_free(obj->u.a.items);
 	fz_free(obj);