diff options
Diffstat (limited to 'object')
| -rw-r--r-- | object/array.c | 2 | ||||
| -rw-r--r-- | object/dict.c | 2 | ||||
| -rw-r--r-- | object/simple.c | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/object/array.c b/object/array.c index c57f3952..78e50963 100644 --- a/object/array.c +++ b/object/array.c @@ -11,8 +11,8 @@ fz_newarray(fz_obj **op, int initialcap) obj = *op = fz_malloc(sizeof (fz_obj)); if (!obj) return fz_outofmem; + obj->nrefs = 1; obj->kind = FZ_ARRAY; - obj->refcount = 1; obj->u.a.len = 0; obj->u.a.cap = initialcap > 0 ? initialcap : 6; diff --git a/object/dict.c b/object/dict.c index fda48dc3..70e5005b 100644 --- a/object/dict.c +++ b/object/dict.c @@ -11,8 +11,8 @@ fz_newdict(fz_obj **op, int initialcap) obj = *op = fz_malloc(sizeof (fz_obj)); if (!obj) return fz_outofmem; + obj->nrefs = 1; obj->kind = FZ_DICT; - obj->refcount = 1; obj->u.d.len = 0; obj->u.d.cap = initialcap > 0 ? initialcap : 10; diff --git a/object/simple.c b/object/simple.c index 9f645c89..b06c77d7 100644 --- a/object/simple.c +++ b/object/simple.c @@ -3,12 +3,12 @@ extern void fz_droparray(fz_obj *array); extern void fz_dropdict(fz_obj *dict); -#define NEWOBJ(KIND,SIZE) \ - fz_obj *o; \ - o = *op = fz_malloc(SIZE); \ - if (!o) return fz_outofmem; \ - o->kind = KIND; \ - o->refcount = 1 +#define NEWOBJ(KIND,SIZE) \ + fz_obj *o; \ + o = *op = fz_malloc(SIZE); \ + if (!o) return fz_outofmem; \ + o->nrefs = 1; \ + o->kind = KIND; \ fz_error * fz_newnull(fz_obj **op) @@ -71,22 +71,22 @@ fz_error * fz_newpointer(fz_obj **op, void *p) { NEWOBJ(FZ_POINTER, sizeof (fz_obj)); - o->u.p = p; - return nil; + o->u.p = p; + return nil; } fz_obj * fz_keepobj(fz_obj *o) { - o->refcount ++; + o->nrefs ++; return o; } fz_obj * fz_dropobj(fz_obj *o) { - o->refcount --; - if (o->refcount == 0) { + if (--o->nrefs == 0) + { if (o->kind == FZ_ARRAY) fz_droparray(o); else if (o->kind == FZ_DICT) |