summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/error.c10
-rw-r--r--filter/buffer.c8
-rw-r--r--filter/faxd.c10
-rw-r--r--filter/faxe.c20
-rw-r--r--filter/filer.c2
-rw-r--r--filter/filter.c4
-rw-r--r--filter/lzwe.c6
-rw-r--r--filter/rle.c26
-rw-r--r--include/fitz/base.h2
-rw-r--r--include/fitz/colorspace.h2
-rw-r--r--include/fitz/filter.h6
-rw-r--r--include/fitz/font.h2
-rw-r--r--include/fitz/image.h2
-rw-r--r--include/fitz/object.h2
-rw-r--r--include/fitz/tree.h2
-rw-r--r--mupdf/colorspace.c2
-rw-r--r--mupdf/pagetree.c48
-rw-r--r--mupdf/xref.c2
-rw-r--r--object/array.c44
-rw-r--r--object/dict.c54
-rw-r--r--object/parse.c94
-rw-r--r--object/simple.c6
-rw-r--r--tree/cmap.c34
-rw-r--r--tree/colorspace.c6
-rw-r--r--tree/font.c6
-rw-r--r--tree/image.c4
-rw-r--r--tree/tree.c6
27 files changed, 205 insertions, 205 deletions
diff --git a/base/error.c b/base/error.c
index d7065dbd..926c48dc 100644
--- a/base/error.c
+++ b/base/error.c
@@ -20,7 +20,7 @@ fz_throw1(char *fmt, ...)
eo = fz_malloc(sizeof(fz_error));
if (!eo) return fz_outofmem;
- eo->nrefs = 1;
+ eo->refs = 1;
strlcpy(eo->func, "unknown", sizeof eo->func);
strlcpy(eo->file, "unknown", sizeof eo->file);
eo->line = 0;
@@ -42,7 +42,7 @@ fz_throw0(const char *func, const char *file, int line, char *fmt, ...)
eo = fz_malloc(sizeof(fz_error));
if (!eo) return fz_outofmem;
- eo->nrefs = 1;
+ eo->refs = 1;
strlcpy(eo->func, func, sizeof eo->func);
strlcpy(eo->file, file, sizeof eo->file);
eo->line = line;
@@ -61,9 +61,9 @@ fz_throw0(const char *func, const char *file, int line, char *fmt, ...)
void
fz_droperror(fz_error *eo)
{
- if (eo->nrefs > 0)
- eo->nrefs--;
- if (eo->nrefs == 0)
+ if (eo->refs > 0)
+ eo->refs--;
+ if (eo->refs == 0)
fz_free(eo);
}
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;
diff --git a/include/fitz/base.h b/include/fitz/base.h
index e08b2f09..d1c5343a 100644
--- a/include/fitz/base.h
+++ b/include/fitz/base.h
@@ -25,7 +25,7 @@ typedef struct fz_error_s fz_error;
struct fz_error_s
{
- int nrefs;
+ int refs;
char msg[184];
char file[32];
char func[32];
diff --git a/include/fitz/colorspace.h b/include/fitz/colorspace.h
index ec4d019c..322b96c8 100644
--- a/include/fitz/colorspace.h
+++ b/include/fitz/colorspace.h
@@ -6,7 +6,7 @@ typedef struct fz_colorcube4_s fz_colorcube4;
struct fz_colorspace_s
{
- int nrefs;
+ int refs;
char name[16];
int n;
void (*toxyz)(fz_colorspace *, float *src, float *xyz);
diff --git a/include/fitz/filter.h b/include/fitz/filter.h
index 7f45bd34..03cb5f1f 100644
--- a/include/fitz/filter.h
+++ b/include/fitz/filter.h
@@ -17,7 +17,7 @@ extern fz_error fz_kiodone;
TYPE *VAR; \
*fp = fz_malloc(sizeof(TYPE)); \
if (!*fp) return fz_outofmem; \
- (*fp)->nrefs = 1; \
+ (*fp)->refs = 1; \
(*fp)->process = fz_process ## NAME ; \
(*fp)->drop = fz_drop ## NAME ; \
(*fp)->consumed = 0; \
@@ -27,7 +27,7 @@ extern fz_error fz_kiodone;
struct fz_filter_s
{
- int nrefs;
+ int refs;
fz_error* (*process)(fz_filter *filter, fz_buffer *in, fz_buffer *out);
void (*drop)(fz_filter *filter);
int consumed;
@@ -37,7 +37,7 @@ struct fz_filter_s
struct fz_buffer_s
{
- int nrefs;
+ int refs;
int ownsdata;
unsigned char *bp;
unsigned char *rp;
diff --git a/include/fitz/font.h b/include/fitz/font.h
index fb29e1c2..ea1ad692 100644
--- a/include/fitz/font.h
+++ b/include/fitz/font.h
@@ -22,7 +22,7 @@ struct fz_vmtx_s
struct fz_font_s
{
- int nrefs;
+ int refs;
char name[32];
fz_error* (*render)(fz_glyph*, fz_font*, int, fz_matrix);
diff --git a/include/fitz/image.h b/include/fitz/image.h
index 6debfaa5..89d180ba 100644
--- a/include/fitz/image.h
+++ b/include/fitz/image.h
@@ -4,7 +4,7 @@ typedef struct fz_image_s fz_image;
struct fz_image_s
{
- int nrefs;
+ int refs;
fz_error* (*loadtile)(fz_image*,fz_pixmap*);
void (*drop)(fz_image*);
fz_colorspace *cs;
diff --git a/include/fitz/object.h b/include/fitz/object.h
index 014dc33d..41025b8b 100644
--- a/include/fitz/object.h
+++ b/include/fitz/object.h
@@ -24,7 +24,7 @@ struct fz_keyval_s
struct fz_obj_s
{
- unsigned short nrefs;
+ unsigned short refs;
unsigned short kind; /* fz_objkind takes 4 bytes :( */
union
{
diff --git a/include/fitz/tree.h b/include/fitz/tree.h
index af9fc36c..b5cd8c8e 100644
--- a/include/fitz/tree.h
+++ b/include/fitz/tree.h
@@ -3,7 +3,7 @@ typedef struct fz_node_s fz_node;
struct fz_tree_s
{
- int nrefs;
+ int refs;
fz_node *root;
fz_node *head;
};
diff --git a/mupdf/colorspace.c b/mupdf/colorspace.c
index 437455f0..f636a013 100644
--- a/mupdf/colorspace.c
+++ b/mupdf/colorspace.c
@@ -7,7 +7,7 @@ static void initcs(fz_colorspace *cs, char *name, int n,
void(*drop)(fz_colorspace*))
{
strlcpy(cs->name, name, sizeof cs->name);
- cs->nrefs = 1;
+ cs->refs = 1;
cs->n = n;
cs->toxyz = to;
cs->fromxyz = from;
diff --git a/mupdf/pagetree.c b/mupdf/pagetree.c
index 6e9b85eb..3a75b373 100644
--- a/mupdf/pagetree.c
+++ b/mupdf/pagetree.c
@@ -13,7 +13,7 @@ static fz_error *
loadpagetree(pdf_xref *xref, pdf_pagetree *pages,
struct stuff inherit, fz_obj *obj, fz_obj *ref)
{
- fz_error *err;
+ fz_error *error;
fz_obj *type;
fz_obj *kids;
fz_obj *kref, *kobj;
@@ -25,23 +25,23 @@ loadpagetree(pdf_xref *xref, pdf_pagetree *pages,
if (strcmp(fz_toname(type), "Page") == 0)
{
if (inherit.resources && !fz_dictgets(obj, "Resources")) {
- err = fz_dictputs(obj, "Resources", inherit.resources);
- if (err) return err;
+ error = fz_dictputs(obj, "Resources", inherit.resources);
+ if (error) return error;
}
if (inherit.mediabox && !fz_dictgets(obj, "MediaBox")) {
- err = fz_dictputs(obj, "MediaBox", inherit.mediabox);
- if (err) return err;
+ error = fz_dictputs(obj, "MediaBox", inherit.mediabox);
+ if (error) return error;
}
if (inherit.cropbox && !fz_dictgets(obj, "CropBox")) {
- err = fz_dictputs(obj, "CropBox", inherit.cropbox);
- if (err) return err;
+ error = fz_dictputs(obj, "CropBox", inherit.cropbox);
+ if (error) return error;
}
if (inherit.rotate && !fz_dictgets(obj, "Rotate")) {
- err = fz_dictputs(obj, "Rotate", inherit.rotate);
- if (err) return err;
+ error = fz_dictputs(obj, "Rotate", inherit.rotate);
+ if (error) return error;
}
pages->pref[pages->cursor] = fz_keepobj(ref);
@@ -68,12 +68,12 @@ loadpagetree(pdf_xref *xref, pdf_pagetree *pages,
{
kref = fz_arrayget(kids, i);
- err = pdf_loadindirect(&kobj, xref, kref);
- if (err) return err;
+ error = pdf_loadindirect(&kobj, xref, kref);
+ if (error) return error;
- err = loadpagetree(xref, pages, inherit, kobj, kref);
+ error = loadpagetree(xref, pages, inherit, kobj, kref);
fz_dropobj(kobj);
- if (err) return err;
+ if (error) return error;
}
}
@@ -98,7 +98,7 @@ pdf_debugpagetree(pdf_pagetree *pages)
fz_error *
pdf_loadpagetree(pdf_pagetree **pp, pdf_xref *xref)
{
- fz_error *err;
+ fz_error *error;
struct stuff inherit;
pdf_pagetree *p = nil;
fz_obj *catalog = nil;
@@ -115,18 +115,18 @@ pdf_loadpagetree(pdf_pagetree **pp, pdf_xref *xref)
trailer = xref->trailer;
ref = fz_dictgets(trailer, "Root");
- err = pdf_loadindirect(&catalog, xref, ref);
- if (err) goto error;
+ error = pdf_loadindirect(&catalog, xref, ref);
+ if (error) goto cleanup;
ref = fz_dictgets(catalog, "Pages");
- err = pdf_loadindirect(&pages, xref, ref);
- if (err) goto error;
+ error = pdf_loadindirect(&pages, xref, ref);
+ if (error) goto cleanup;
ref = fz_dictgets(pages, "Count");
count = fz_toint(ref);
p = *pp = fz_malloc(sizeof(pdf_pagetree));
- if (!p) { err = fz_outofmem; goto error; }
+ if (!p) { error = fz_outofmem; goto cleanup; }
p->pref = nil;
p->pobj = nil;
@@ -134,19 +134,19 @@ pdf_loadpagetree(pdf_pagetree **pp, pdf_xref *xref)
p->cursor = 0;
p->pref = fz_malloc(sizeof(fz_obj*) * count);
- if (!p->pref) { err = fz_outofmem; goto error; }
+ if (!p->pref) { error = fz_outofmem; goto cleanup; }
p->pobj = fz_malloc(sizeof(fz_obj*) * count);
- if (!p->pobj) { err = fz_outofmem; goto error; }
+ if (!p->pobj) { error = fz_outofmem; goto cleanup; }
- err = loadpagetree(xref, p, inherit, pages, ref);
- if (err) goto error;
+ error = loadpagetree(xref, p, inherit, pages, ref);
+ if (error) goto cleanup;
fz_dropobj(pages);
fz_dropobj(catalog);
return nil;
-error:
+cleanup:
if (pages) fz_dropobj(pages);
if (catalog) fz_dropobj(catalog);
if (p) {
diff --git a/mupdf/xref.c b/mupdf/xref.c
index 40f1f65a..c4e9a813 100644
--- a/mupdf/xref.c
+++ b/mupdf/xref.c
@@ -114,7 +114,7 @@ pdf_debugpdf(pdf_xref *xref)
xref->table[i].ofs,
xref->table[i].gen,
xref->table[i].type,
- xref->table[i].obj ? xref->table[i].obj->nrefs : 0,
+ xref->table[i].obj ? xref->table[i].obj->refs : 0,
xref->table[i].stmofs);
}
}
diff --git a/object/array.c b/object/array.c
index 78e50963..c493bdaa 100644
--- a/object/array.c
+++ b/object/array.c
@@ -11,7 +11,7 @@ fz_newarray(fz_obj **op, int initialcap)
obj = *op = fz_malloc(sizeof (fz_obj));
if (!obj) return fz_outofmem;
- obj->nrefs = 1;
+ obj->refs = 1;
obj->kind = FZ_ARRAY;
obj->u.a.len = 0;
@@ -29,20 +29,20 @@ fz_newarray(fz_obj **op, int initialcap)
fz_error *
fz_copyarray(fz_obj **op, fz_obj *obj)
{
- fz_error *err;
+ fz_error *error;
fz_obj *new;
int i;
if (!fz_isarray(obj))
return fz_throw("typecheck in copyarray");
- err = fz_newarray(&new, fz_arraylen(obj));
- if (err) return err;
+ error = fz_newarray(&new, fz_arraylen(obj));
+ if (error) return error;
*op = new;
for (i = 0; i < fz_arraylen(obj); i++) {
- err = fz_arraypush(new, fz_arrayget(obj, i));
- if (err) { fz_droparray(new); return err; }
+ error = fz_arraypush(new, fz_arrayget(obj, i));
+ if (error) { fz_droparray(new); return error; }
}
return nil;
@@ -51,7 +51,7 @@ fz_copyarray(fz_obj **op, fz_obj *obj)
fz_error *
fz_deepcopyarray(fz_obj **op, fz_obj *obj)
{
- fz_error *err;
+ fz_error *error;
fz_obj *new;
fz_obj *val;
int i;
@@ -59,8 +59,8 @@ fz_deepcopyarray(fz_obj **op, fz_obj *obj)
if (!fz_isarray(obj))
return fz_throw("typecheck in deepcopyarray");
- err = fz_newarray(&new, fz_arraylen(obj));
- if (err) return err;
+ error = fz_newarray(&new, fz_arraylen(obj));
+ if (error) return error;
*op = new;
for (i = 0; i < fz_arraylen(obj); i++)
@@ -68,24 +68,24 @@ fz_deepcopyarray(fz_obj **op, fz_obj *obj)
val = fz_arrayget(obj, i);
if (fz_isarray(val)) {
- err = fz_deepcopyarray(&val, val);
- if (err) { fz_droparray(new); return err; }
- err = fz_arraypush(new, val);
- if (err) { fz_dropobj(val); fz_droparray(new); return err; }
+ error = fz_deepcopyarray(&val, val);
+ if (error) { fz_droparray(new); return error; }
+ error = fz_arraypush(new, val);
+ if (error) { fz_dropobj(val); fz_droparray(new); return error; }
fz_dropobj(val);
}
else if (fz_isdict(val)) {
- err = fz_deepcopydict(&val, val);
- if (err) { fz_droparray(new); return err; }
- err = fz_arraypush(new, val);
- if (err) { fz_dropobj(val); fz_droparray(new); return err; }
+ error = fz_deepcopydict(&val, val);
+ if (error) { fz_droparray(new); return error; }
+ error = fz_arraypush(new, val);
+ if (error) { fz_dropobj(val); fz_droparray(new); return error; }
fz_dropobj(val);
}
else {
- err = fz_arraypush(new, val);
- if (err) { fz_droparray(new); return err; }
+ error = fz_arraypush(new, val);
+ if (error) { fz_droparray(new); return error; }
}
}
@@ -151,14 +151,14 @@ growarray(fz_obj *obj)
fz_error *
fz_arraypush(fz_obj *obj, fz_obj *item)
{
- fz_error *err;
+ fz_error *error;
if (!fz_isarray(obj))
return fz_throw("typecheck in arraypush");
if (obj->u.a.len + 1 > obj->u.a.cap) {
- err = growarray(obj);
- if (err) return err;
+ error = growarray(obj);
+ if (error) return error;
}
obj->u.a.items[obj->u.a.len] = fz_keepobj(item);
diff --git a/object/dict.c b/object/dict.c
index 70e5005b..32d066b9 100644
--- a/object/dict.c
+++ b/object/dict.c
@@ -11,7 +11,7 @@ fz_newdict(fz_obj **op, int initialcap)
obj = *op = fz_malloc(sizeof (fz_obj));
if (!obj) return fz_outofmem;
- obj->nrefs = 1;
+ obj->refs = 1;
obj->kind = FZ_DICT;
obj->u.d.len = 0;
@@ -31,20 +31,20 @@ fz_newdict(fz_obj **op, int initialcap)
fz_error *
fz_copydict(fz_obj **op, fz_obj *obj)
{
- fz_error *err;
+ fz_error *error;
fz_obj *new;
int i;
if (!fz_isdict(obj))
return fz_throw("typecheck in copydict");
- err = fz_newdict(&new, obj->u.d.cap);
- if (err) return err;
+ error = fz_newdict(&new, obj->u.d.cap);
+ if (error) return error;
*op = new;
for (i = 0; i < fz_dictlen(obj); i++) {
- err = fz_dictput(new, fz_dictgetkey(obj, i), fz_dictgetval(obj, i));
- if (err) { fz_dropdict(new); return err; }
+ error = fz_dictput(new, fz_dictgetkey(obj, i), fz_dictgetval(obj, i));
+ if (error) { fz_dropdict(new); return error; }
}
return nil;
@@ -53,7 +53,7 @@ fz_copydict(fz_obj **op, fz_obj *obj)
fz_error *
fz_deepcopydict(fz_obj **op, fz_obj *obj)
{
- fz_error *err;
+ fz_error *error;
fz_obj *new;
fz_obj *val;
int i;
@@ -61,8 +61,8 @@ fz_deepcopydict(fz_obj **op, fz_obj *obj)
if (!fz_isdict(obj))
return fz_throw("typecheck in deepcopydict");
- err = fz_newdict(&new, obj->u.d.cap);
- if (err) return err;
+ error = fz_newdict(&new, obj->u.d.cap);
+ if (error) return error;
*op = new;
for (i = 0; i < fz_dictlen(obj); i++)
@@ -70,24 +70,24 @@ fz_deepcopydict(fz_obj **op, fz_obj *obj)
val = fz_dictgetval(obj, i);
if (fz_isarray(val)) {
- err = fz_deepcopyarray(&val, val);
- if (err) { fz_dropdict(new); return err; }
- err = fz_dictput(new, fz_dictgetkey(obj, i), val);
- if (err) { fz_dropobj(val); fz_dropdict(new); return err; }
+ error = fz_deepcopyarray(&val, val);
+ if (error) { fz_dropdict(new); return error; }
+ error = fz_dictput(new, fz_dictgetkey(obj, i), val);
+ if (error) { fz_dropobj(val); fz_dropdict(new); return error; }
fz_dropobj(val);
}
else if (fz_isdict(val)) {
- err = fz_deepcopydict(&val, val);
- if (err) { fz_dropdict(new); return err; }
- err = fz_dictput(new, fz_dictgetkey(obj, i), val);
- if (err) { fz_dropobj(val); fz_dropdict(new); return err; }
+ error = fz_deepcopydict(&val, val);
+ if (error) { fz_dropdict(new); return error; }
+ error = fz_dictput(new, fz_dictgetkey(obj, i), val);
+ if (error) { fz_dropobj(val); fz_dropdict(new); return error; }
fz_dropobj(val);
}
else {
- err = fz_dictput(new, fz_dictgetkey(obj, i), val);
- if (err) { fz_dropdict(new); return err; }
+ error = fz_dictput(new, fz_dictgetkey(obj, i), val);
+ if (error) { fz_dropdict(new); return error; }
}
}
@@ -182,7 +182,7 @@ fz_dictgetsa(fz_obj *obj, char *key, char *abbrev)
fz_error *
fz_dictput(fz_obj *obj, fz_obj *key, fz_obj *val)
{
- fz_error *err;
+ fz_error *error;
int i;
char *s;
@@ -202,8 +202,8 @@ fz_dictput(fz_obj *obj, fz_obj *key, fz_obj *val)
}
if (obj->u.d.len + 1 > obj->u.d.cap) {
- err = growdict(obj);
- if (err) return err;
+ error = growdict(obj);
+ if (error) return error;
}
obj->u.d.items[obj->u.d.len].k = fz_keepobj(key);
@@ -216,13 +216,13 @@ fz_dictput(fz_obj *obj, fz_obj *key, fz_obj *val)
fz_error *
fz_dictputs(fz_obj *obj, char *key, fz_obj *val)
{
- fz_error *err;
+ fz_error *error;
fz_obj *keyobj;
- err = fz_newname(&keyobj, key);
- if (err) return err;
- err = fz_dictput(obj, keyobj, val);
+ error = fz_newname(&keyobj, key);
+ if (error) return error;
+ error = fz_dictput(obj, keyobj, val);
fz_dropobj(keyobj);
- return err;
+ return error;
}
fz_error *
diff --git a/object/parse.c b/object/parse.c
index 99211243..20d531c4 100644
--- a/object/parse.c
+++ b/object/parse.c
@@ -97,14 +97,14 @@ static fz_error *parsenumber(fz_obj **obj, char **sp)
static fz_error *parsedict(fz_obj **obj, char **sp, struct vap *v)
{
- fz_error *err = nil;
+ fz_error *error = nil;
fz_obj *dict = nil;
fz_obj *key = nil;
fz_obj *val = nil;
char *s = *sp;
- err = fz_newdict(&dict, 8);
- if (err) return err;
+ error = fz_newdict(&dict, 8);
+ if (error) return error;
*obj = dict;
s += 2; /* skip "<<" */
@@ -120,26 +120,26 @@ static fz_error *parsedict(fz_obj **obj, char **sp, struct vap *v)
s ++;
break;
}
- err = fz_throw("syntaxerror in parsedict");
- goto error;
+ error = fz_throw("syntaxerror in parsedict");
+ goto cleanup;
}
/* non-name as key, bail */
if (*s != '/') {
- err = fz_throw("syntaxerror in parsedict");
- goto error;
+ error = fz_throw("syntaxerror in parsedict");
+ goto cleanup;
}
- err = parsename(&key, &s);
- if (err) goto error;
+ error = parsename(&key, &s);
+ if (error) goto cleanup;
skipwhite(&s);
- err = parseobj(&val, &s, v);
- if (err) goto error;
+ error = parseobj(&val, &s, v);
+ if (error) goto cleanup;
- err = fz_dictput(dict, key, val);
- if (err) goto error;
+ error = fz_dictput(dict, key, val);
+ if (error) goto cleanup;
fz_dropobj(val); val = nil;
fz_dropobj(key); key = nil;
@@ -148,24 +148,24 @@ static fz_error *parsedict(fz_obj **obj, char **sp, struct vap *v)
*sp = s;
return nil;
-error:
+cleanup:
if (val) fz_dropobj(val);
if (key) fz_dropobj(key);
if (dict) fz_dropobj(dict);
*obj = nil;
*sp = s;
- return err;
+ return error;
}
static fz_error *parsearray(fz_obj **obj, char **sp, struct vap *v)
{
- fz_error *err;
+ fz_error *error;
fz_obj *a;
fz_obj *o;
char *s = *sp;
- err = fz_newarray(&a, 8);
- if (err) return err;
+ error = fz_newarray(&a, 8);
+ if (error) return error;
*obj = a;
s ++; /* skip '[' */
@@ -179,11 +179,11 @@ static fz_error *parsearray(fz_obj **obj, char **sp, struct vap *v)
break;
}
- err = parseobj(&o, &s, v);
- if (err) { *obj = nil; fz_dropobj(a); return err; }
+ error = parseobj(&o, &s, v);
+ if (error) { *obj = nil; fz_dropobj(a); return error; }
- err = fz_arraypush(a, o);
- if (err) { fz_dropobj(o); *obj = nil; fz_dropobj(a); return err; }
+ error = fz_arraypush(a, o);
+ if (error) { fz_dropobj(o); *obj = nil; fz_dropobj(a); return error; }
fz_dropobj(o);
}
@@ -291,7 +291,7 @@ static fz_error *parsehexstring(fz_obj **obj, char **sp)
static fz_error *parseobj(fz_obj **obj, char **sp, struct vap *v)
{
- fz_error *err;
+ fz_error *error;
char buf[32];
int oid, gid, len;
char *tmp;
@@ -302,7 +302,7 @@ static fz_error *parseobj(fz_obj **obj, char **sp, struct vap *v)
skipwhite(&s);
- err = nil;
+ error = nil;
if (v != nil && *s == '%')
{
@@ -310,86 +310,86 @@ static fz_error *parseobj(fz_obj **obj, char **sp, struct vap *v)
switch (*s)
{
case 'o': *obj = fz_keepobj(va_arg(v->ap, fz_obj*)); break;
- case 'b': err = fz_newbool(obj, va_arg(v->ap, int)); break;
- case 'i': err = fz_newint(obj, va_arg(v->ap, int)); break;
- case 'f': err = fz_newreal(obj, (float)va_arg(v->ap, double)); break;
- case 'n': err = fz_newname(obj, va_arg(v->ap, char*)); break;
+ case 'b': error = fz_newbool(obj, va_arg(v->ap, int)); break;
+ case 'i': error = fz_newint(obj, va_arg(v->ap, int)); break;
+ case 'f': error = fz_newreal(obj, (float)va_arg(v->ap, double)); break;
+ case 'n': error = fz_newname(obj, va_arg(v->ap, char*)); break;
case 'r':
oid = va_arg(v->ap, int);
gid = va_arg(v->ap, int);
- err = fz_newindirect(obj, oid, gid);
+ error = fz_newindirect(obj, oid, gid);
break;
case 's':
tmp = va_arg(v->ap, char*);
- err = fz_newstring(obj, tmp, strlen(tmp));
+ error = fz_newstring(obj, tmp, strlen(tmp));
break;
case '#':
tmp = va_arg(v->ap, char*);
len = va_arg(v->ap, int);
- err = fz_newstring(obj, tmp, len);
+ error = fz_newstring(obj, tmp, len);
break;
default:
- err = fz_throw("unknown format specifier in packobj: '%c'", *s);
+ error = fz_throw("unknown format specifier in packobj: '%c'", *s);
break;
}
s ++;
}
else if (*s == '/')
- err = parsename(obj, &s);
+ error = parsename(obj, &s);
else if (*s == '(')
- err = parsestring(obj, &s);
+ error = parsestring(obj, &s);
else if (*s == '<') {
if (s[1] == '<')
- err = parsedict(obj, &s, v);
+ error = parsedict(obj, &s, v);
else
- err = parsehexstring(obj, &s);
+ error = parsehexstring(obj, &s);
}
else if (*s == '[')
- err = parsearray(obj, &s, v);
+ error = parsearray(obj, &s, v);
else if (*s == '-' || *s == '.' || (*s >= '0' && *s <= '9'))
- err = parsenumber(obj, &s);
+ error = parsenumber(obj, &s);
else if (isregular(*s))
{
parsekeyword(&s, buf, buf + sizeof buf);
if (strcmp("true", buf) == 0)
- err = fz_newbool(obj, 1);
+ error = fz_newbool(obj, 1);
else if (strcmp("false", buf) == 0)
- err = fz_newbool(obj, 0);
+ error = fz_newbool(obj, 0);
else if (strcmp("null", buf) == 0)
- err = fz_newnull(obj);
+ error = fz_newnull(obj);
else
- err = fz_throw("syntaxerror in parseobj: undefined keyword %s", buf);
+ error = fz_throw("syntaxerror in parseobj: undefined keyword %s", buf);
}
else
- err = fz_throw("syntaxerror in parseobj");
+ error = fz_throw("syntaxerror in parseobj");
*sp = s;
- return err;
+ return error;
}
fz_error *
fz_packobj(fz_obj **op, char *fmt, ...)
{
- fz_error *err;
+ fz_error *error;
struct vap v;
va_list ap;
va_start(ap, fmt);
va_copy(v.ap, ap);
- err = parseobj(op, &fmt, &v);
+ error = parseobj(op, &fmt, &v);
va_end(ap);
- return err;
+ return error;
}
fz_error *
diff --git a/object/simple.c b/object/simple.c
index 0755a795..629fdf85 100644
--- a/object/simple.c
+++ b/object/simple.c
@@ -7,7 +7,7 @@ extern void fz_dropdict(fz_obj *dict);
fz_obj *o; \
o = *op = fz_malloc(SIZE); \
if (!o) return fz_outofmem; \
- o->nrefs = 1; \
+ o->refs = 1; \
o->kind = KIND; \
fz_error *
@@ -78,14 +78,14 @@ fz_newpointer(fz_obj **op, void *p)
fz_obj *
fz_keepobj(fz_obj *o)
{
- o->nrefs ++;
+ o->refs ++;
return o;
}
void
fz_dropobj(fz_obj *o)
{
- if (--o->nrefs == 0)
+ if (--o->refs == 0)
{
if (o->kind == FZ_ARRAY)
fz_droparray(o);
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);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 20:27:55 +0000