some renames

5 files changed, 28 insertions, 28 deletions

diff --git a/tree/cmap.c b/tree/cmap.c
index 532246bc..1d1b3e6d 100644
--- a/tree/cmap.c
+++ b/tree/cmap.c
@@ -15,7 +15,7 @@ struct fz_range_s
 
 struct fz_cmap_s
 {
-	int nrefs;
+	int refs;
 	char cmapname[32];
 
 	char usecmapname[32];
@@ -46,7 +46,7 @@ fz_newcmap(fz_cmap **cmapp)
 	if (!cmap)
 		return fz_outofmem;
 
-	cmap->nrefs = 1;
+	cmap->refs = 1;
 	strcpy(cmap->cmapname, "");
 
 	strcpy(cmap->usecmapname, "");
@@ -70,14 +70,14 @@ fz_newcmap(fz_cmap **cmapp)
 fz_cmap *
 fz_keepcmap(fz_cmap *cmap)
 {
-	cmap->nrefs ++;
+	cmap->refs ++;
 	return cmap;
 }
 
 void
 fz_dropcmap(fz_cmap *cmap)
 {
-	if (--cmap->nrefs == 0)
+	if (--cmap->refs == 0)
 	{
 		if (cmap->usecmap)
 			fz_dropcmap(cmap->usecmap);
@@ -221,7 +221,7 @@ static int compare(const void *va, const void *vb)
 fz_error *
 fz_endcidrange(fz_cmap *cmap)
 {
-	fz_error *err;
+	fz_error *error;
 	fz_range *newranges;
 	int *newlookup;
 	fz_range *a;			/* last written range on output */
@@ -251,9 +251,9 @@ fz_endcidrange(fz_cmap *cmap)
 				else if (a->flag == LOOKUP && b->flag == SINGLE)
 				{
 					a->high = b->high;
-					err = addlookup(cmap, b->offset);
-					if (err)
-						return err;
+					error = addlookup(cmap, b->offset);
+					if (error)
+						return error;
 				}
 
 				/* LR -> LR */
@@ -272,13 +272,13 @@ fz_endcidrange(fz_cmap *cmap)
 					a->flag = LOOKUP;
 					a->high = b->high;
 
-					err = addlookup(cmap, a->offset);
-					if (err)
-						return err;
+					error = addlookup(cmap, a->offset);
+					if (error)
+						return error;
 
-					err = addlookup(cmap, b->offset);
-					if (err)
-						return err;
+					error = addlookup(cmap, b->offset);
+					if (error)
+						return error;
 
 					a->offset = cmap->tlen - 2;
 				}
@@ -287,9 +287,9 @@ fz_endcidrange(fz_cmap *cmap)
 				else if (a->flag == LOOKUP && b->flag == SINGLE)
 				{
 					a->high = b->high;
-					err = addlookup(cmap, b->offset);
-					if (err)
-						return err;
+					error = addlookup(cmap, b->offset);
+					if (error)
+						return error;
 				}
 
 				/* XX -> XX */
diff --git a/tree/colorspace.c b/tree/colorspace.c
index a8aff2c2..ae922bcd 100644
--- a/tree/colorspace.c
+++ b/tree/colorspace.c
@@ -3,16 +3,16 @@
 fz_colorspace *
 fz_keepcolorspace(fz_colorspace *cs)
 {
-	cs->nrefs ++;
+	cs->refs ++;
 	return cs;
 }
 
 void
 fz_dropcolorspace(fz_colorspace *cs)
 {
-	if (cs->nrefs < 0)
+	if (cs->refs < 0)
 		return;
-	if (--cs->nrefs == 0)
+	if (--cs->refs == 0)
 	{
 		if (cs->drop)
 			cs->drop(cs);
diff --git a/tree/font.c b/tree/font.c
index 91ba7954..14c09981 100644
--- a/tree/font.c
+++ b/tree/font.c
@@ -3,7 +3,7 @@
 void
 fz_initfont(fz_font *font, char *name)
 {
-	font->nrefs = 1;
+	font->refs = 1;
 	strlcpy(font->name, name, sizeof font->name);
 
 	font->wmode = 0;
@@ -34,14 +34,14 @@ fz_initfont(fz_font *font, char *name)
 fz_font *
 fz_keepfont(fz_font *font)
 {
-	font->nrefs ++;
+	font->refs ++;
 	return font;
 }
 
 void
 fz_dropfont(fz_font *font)
 {
-	if (--font->nrefs == 0)
+	if (--font->refs == 0)
 	{
 		if (font->drop)
 			font->drop(font);
diff --git a/tree/image.c b/tree/image.c
index c448f41a..3b0a3594 100644
--- a/tree/image.c
+++ b/tree/image.c
@@ -3,14 +3,14 @@
 fz_image *
 fz_keepimage(fz_image *image)
 {
-	image->nrefs ++;
+	image->refs ++;
 	return image;
 }
 
 void
 fz_dropimage(fz_image *image)
 {
-	if (--image->nrefs == 0)
+	if (--image->refs == 0)
 	{
 		if (image->drop)
 			image->drop(image);
diff --git a/tree/tree.c b/tree/tree.c
index 4d76b70e..469f352d 100644
--- a/tree/tree.c
+++ b/tree/tree.c
@@ -9,7 +9,7 @@ fz_newtree(fz_tree **treep)
 	if (!tree)
 		return fz_outofmem;
 
-	tree->nrefs = 1;
+	tree->refs = 1;
 	tree->root = nil;
 	tree->head = nil;
 
@@ -19,14 +19,14 @@ fz_newtree(fz_tree **treep)
 fz_tree *
 fz_keeptree(fz_tree *tree)
 {
-	tree->nrefs ++;
+	tree->refs ++;
 	return tree;
 }
 
 void
 fz_droptree(fz_tree *tree)
 {
-	if (--tree->nrefs == 0)
+	if (--tree->refs == 0)
 	{
 		if (tree->root)
 			fz_dropnode(tree->root);