some renames

7 files changed, 38 insertions, 38 deletions

diff --git a/filter/buffer.c b/filter/buffer.c
index 79339456..206137a6 100644
--- a/filter/buffer.c
+++ b/filter/buffer.c
@@ -8,7 +8,7 @@ fz_newbuffer(fz_buffer **bp, int size)
 	b = *bp = fz_malloc(sizeof(fz_buffer));
 	if (!b) return fz_outofmem;
 
-	b->nrefs = 1;
+	b->refs = 1;
 	b->ownsdata = 1;
 	b->bp = fz_malloc(size);
 	if (!b->bp) { fz_free(b); return fz_outofmem; }
@@ -29,7 +29,7 @@ fz_newbufferwithdata(fz_buffer **bp, unsigned char *data, int size)
 	b = *bp = fz_malloc(sizeof(fz_buffer));
 	if (!b) return fz_outofmem;
 
-	b->nrefs = 1;
+	b->refs = 1;
 	b->ownsdata = 0;
 	b->bp = data;
 
@@ -44,14 +44,14 @@ fz_newbufferwithdata(fz_buffer **bp, unsigned char *data, int size)
 fz_buffer *
 fz_keepbuffer(fz_buffer *buf)
 {
-	buf->nrefs ++;
+	buf->refs ++;
 	return buf;
 }
 
 void
 fz_dropbuffer(fz_buffer *buf)
 {
-	if (--buf->nrefs == 0)
+	if (--buf->refs == 0)
 	{
 		if (buf->ownsdata)
 			fz_free(buf->bp);
diff --git a/filter/faxd.c b/filter/faxd.c
index 81e04b81..5f750588 100644
--- a/filter/faxd.c
+++ b/filter/faxd.c
@@ -336,7 +336,7 @@ fz_error *
 fz_processfaxd(fz_filter *f, fz_buffer *in, fz_buffer *out)
 {
 	fz_faxd *fax = (fz_faxd*)f;
-	fz_error * err;
+	fz_error *error;
 	int i;
 
 	if (fax->stage == SEOL)
@@ -382,15 +382,15 @@ loop:
 	else if (fax->dim == 1)
 	{
 		fax->eolc = 0;
-		err = dec1d(fax);
-		if (err) return err;
+		error = dec1d(fax);
+		if (error) return error;
 
 	}
 	else if (fax->dim == 2)
 	{
 		fax->eolc = 0;
-		err = dec2d(fax);
-		if (err) return err;
+		error = dec2d(fax);
+		if (error) return error;
 	}
 
 	/* no eol check after makeup codes nor in the middle of an H code */
diff --git a/filter/faxe.c b/filter/faxe.c
index ccede1a1..a3f10915 100644
--- a/filter/faxe.c
+++ b/filter/faxe.c
@@ -298,7 +298,7 @@ if (fax->a0 < 0)
 static fz_error *
 process(fz_faxe *fax, fz_buffer *in, fz_buffer *out)
 {
-	fz_error *err;
+	fz_error *error;
 	int i, n;
 
 	while (1)
@@ -380,24 +380,24 @@ process(fz_faxe *fax, fz_buffer *in, fz_buffer *out)
 			fax->stage ++;
 			
 		case 3:
-			err = 0; /* to silence compiler */
+			error = 0; /* to silence compiler */
 
 			if (fax->k < 0) {
-				err = enc2d(fax, fax->ref, fax->src, out);
+				error = enc2d(fax, fax->ref, fax->src, out);
 			}
 			else if (fax->k == 0) {
-				err = enc1d(fax, fax->src, out);
+				error = enc1d(fax, fax->src, out);
 			}
 			else if (fax->k > 0) {
 				if (fax->ridx % fax->k == 0) {
-					err = enc1d(fax, fax->src, out);
+					error = enc1d(fax, fax->src, out);
 				}
 				else {
-					err = enc2d(fax, fax->ref, fax->src, out);
+					error = enc2d(fax, fax->ref, fax->src, out);
 				}
 			}
 
-			if (err) return err;
+			if (error) return error;
 
 			fax->ridx ++;
 
@@ -432,16 +432,16 @@ fz_error *
 fz_processfaxe(fz_filter *p, fz_buffer *in, fz_buffer *out)
 {
 	fz_faxe *fax = (fz_faxe*) p;
-	fz_error *err;
+	fz_error *error;
 
 	/* restore partial bits */
 	*out->wp = fax->bsave;
 
-	err = process(fax, in, out);
+	error = process(fax, in, out);
 
 	/* save partial bits */
 	fax->bsave = *out->wp;
 
-	return err;
+	return error;
 }
 
diff --git a/filter/filer.c b/filter/filer.c
index 24f9a214..30f4453f 100644
--- a/filter/filer.c
+++ b/filter/filer.c
@@ -233,7 +233,7 @@ fz_readfile(fz_buffer **bufp, fz_file *file)
 				return fz_outofmem;
 			}
 
-			real->nrefs = 1;
+			real->refs = 1;
 			real->ownsdata = 1;
 			real->bp = buf;
 			real->rp = buf;
diff --git a/filter/filter.c b/filter/filter.c
index 4bd8c4ff..afe4feed 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -34,14 +34,14 @@ fz_process(fz_filter *f, fz_buffer *in, fz_buffer *out)
 fz_filter *
 fz_keepfilter(fz_filter *f)
 {
-	f->nrefs ++;
+	f->refs ++;
 	return f;
 }
 
 void
 fz_dropfilter(fz_filter *f)
 {
-	if (--f->nrefs == 0)
+	if (--f->refs == 0)
 	{
 		if (f->drop)
 			f->drop(f);
diff --git a/filter/lzwe.c b/filter/lzwe.c
index 8065a7b6..f36afd0d 100644
--- a/filter/lzwe.c
+++ b/filter/lzwe.c
@@ -241,16 +241,16 @@ fz_error *
 fz_processlzwe(fz_filter *filter, fz_buffer *in, fz_buffer *out)
 {
 	fz_lzwe *lzw = (fz_lzwe*)filter;
-	fz_error *err;
+	fz_error *error;
 
 	/* restore partial bits */
 	*out->wp = lzw->bsave;
 
-	err = compress(lzw, in, out);
+	error = compress(lzw, in, out);
 
 	/* save partial bits */
 	lzw->bsave = *out->wp;
 
-	return err;
+	return error;
 }
 
diff --git a/filter/rle.c b/filter/rle.c
index 53197139..921e470a 100644
--- a/filter/rle.c
+++ b/filter/rle.c
@@ -129,15 +129,15 @@ fz_error *
 fz_processrle(fz_filter *filter, fz_buffer *in, fz_buffer *out)
 {
 	fz_rle *enc = (fz_rle*)filter;
-	fz_error *err;
+	fz_error *error;
 	unsigned char c;
 
 	while (1)
 	{
 
 		if (enc->reclen && enc->curlen == enc->reclen) {
-			err = savebuf(enc, in, out);
-			if (err) return err;
+			error = savebuf(enc, in, out);
+			if (error) return error;
 #ifdef DEBUG
 fprintf(stderr, "--record--\n");
 #endif
@@ -148,8 +148,8 @@ fprintf(stderr, "--record--\n");
 		if (in->rp == in->wp) {
 			if (in->eof) {
 				if (enc->state != END) {
-					err = savebuf(enc, in, out);
-					if (err) return err;
+					error = savebuf(enc, in, out);
+					if (error) return error;
 				}
 				enc->state = END;
 			}
@@ -176,8 +176,8 @@ fprintf(stderr, "--record--\n");
 		case DIFF:
 			/* out of space */
 			if (enc->run == 128) {
-				err = putdiff(enc, in, out);
-				if (err) return err;
+				error = putdiff(enc, in, out);
+				if (error) return error;
 
 				enc->state = ONE;
 				enc->run = 1;
@@ -191,8 +191,8 @@ fprintf(stderr, "--record--\n");
 			{
 				if (enc->run >= 3) {
 					enc->run -= 2;	/* skip prev two for diff run */
-					err = putdiff(enc, in, out);
-					if (err) return err;
+					error = putdiff(enc, in, out);
+					if (error) return error;
 				}
 
 				enc->state = SAME;
@@ -208,8 +208,8 @@ fprintf(stderr, "--record--\n");
 
 		case SAME:
 			if (enc->run == 128 || c != enc->buf[0]) {
-				err = putsame(enc, in, out);
-				if (err) return err;
+				error = putsame(enc, in, out);
+				if (error) return error;
 
 				enc->state = ONE;
 				enc->run = 1;
@@ -221,8 +221,8 @@ fprintf(stderr, "--record--\n");
 			break;
 
 		case END:
-			err = puteod(enc, in, out);
-			if (err) return err;
+			error = puteod(enc, in, out);
+			if (error) return error;
 			
 			out->eof = 1;
 			return fz_iodone;