diff options
| -rw-r--r-- | fitz/fitz_stream.h | 5 | ||||
| -rw-r--r-- | fitz/obj_parse.c | 1 | ||||
| -rw-r--r-- | fitz/obj_print.c | 4 | ||||
| -rw-r--r-- | fitz/obj_simple.c | 25 |
4 files changed, 0 insertions, 35 deletions
diff --git a/fitz/fitz_stream.h b/fitz/fitz_stream.h index 55aa15f1..1e20f5f7 100644 --- a/fitz/fitz_stream.h +++ b/fitz/fitz_stream.h @@ -18,7 +18,6 @@ typedef enum fz_objkind_e FZ_ARRAY, FZ_DICT, FZ_INDIRECT, - FZ_POINTER } fz_objkind; struct fz_keyval_s @@ -56,7 +55,6 @@ struct fz_obj_s int oid; int gid; } r; - void *p; } u; }; @@ -67,7 +65,6 @@ fz_error fz_newreal(fz_obj **op, float f); fz_error fz_newname(fz_obj **op, char *str); fz_error fz_newstring(fz_obj **op, char *str, int len); fz_error fz_newindirect(fz_obj **op, int oid, int gid); -fz_error fz_newpointer(fz_obj **op, void *p); fz_error fz_newarray(fz_obj **op, int initialcap); fz_error fz_newdict(fz_obj **op, int initialcap); @@ -89,7 +86,6 @@ int fz_isstring(fz_obj *obj); int fz_isarray(fz_obj *obj); int fz_isdict(fz_obj *obj); int fz_isindirect(fz_obj *obj); -int fz_ispointer(fz_obj *obj); int fz_objcmp(fz_obj *a, fz_obj *b); @@ -102,7 +98,6 @@ char *fz_tostrbuf(fz_obj *obj); int fz_tostrlen(fz_obj *obj); int fz_tonum(fz_obj *obj); int fz_togen(fz_obj *obj); -void *fz_topointer(fz_obj *obj); fz_error fz_newnamefromstring(fz_obj **op, fz_obj *str); diff --git a/fitz/obj_parse.c b/fitz/obj_parse.c index ba60f5eb..531137b1 100644 --- a/fitz/obj_parse.c +++ b/fitz/obj_parse.c @@ -357,7 +357,6 @@ static fz_error parseobj(fz_obj **obj, char **sp, struct vap *v) switch (*s) { - case 'p': error = fz_newpointer(obj, va_arg(v->ap, void*)); break; case 'o': *obj = fz_keepobj(va_arg(v->ap, fz_obj*)); 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; diff --git a/fitz/obj_print.c b/fitz/obj_print.c index e3aabf74..58ab1268 100644 --- a/fitz/obj_print.c +++ b/fitz/obj_print.c @@ -278,10 +278,6 @@ static void fmtobj(struct fmt *fmt, fz_obj *obj) sprintf(buf, "%d %d R", obj->u.r.oid, obj->u.r.gid); fmtputs(fmt, buf); break; - case FZ_POINTER: - sprintf(buf, "$%p", obj->u.p); - fmtputs(fmt, buf); - break; default: sprintf(buf, "<unknown object type %d>", obj->kind); fmtputs(fmt, buf); diff --git a/fitz/obj_simple.c b/fitz/obj_simple.c index acc06478..031e55ee 100644 --- a/fitz/obj_simple.c +++ b/fitz/obj_simple.c @@ -69,14 +69,6 @@ fz_newindirect(fz_obj **op, int objid, int genid) return fz_okay; } -fz_error -fz_newpointer(fz_obj **op, void *p) -{ - NEWOBJ(FZ_POINTER, sizeof (fz_obj)); - o->u.p = p; - return fz_okay; -} - fz_obj * fz_keepobj(fz_obj *o) { @@ -155,12 +147,6 @@ fz_isindirect(fz_obj *obj) } int -fz_ispointer(fz_obj *obj) -{ - return obj ? obj->kind == FZ_POINTER : 0; -} - -int fz_tobool(fz_obj *obj) { if (fz_isbool(obj)) @@ -228,14 +214,6 @@ fz_togen(fz_obj *obj) return 0; } -void * -fz_topointer(fz_obj *obj) -{ - if (fz_ispointer(obj)) - return obj->u.p; - return nil; -} - fz_error fz_newnamefromstring(fz_obj **op, fz_obj *str) { @@ -295,8 +273,6 @@ fz_objcmp(fz_obj *a, fz_obj *b) } return 0; - case FZ_POINTER: - return (char *) a->u.p - (char *) b->u.p; } return 1; } @@ -316,7 +292,6 @@ char *fz_objkindstr(fz_obj *obj) case FZ_ARRAY: return "array"; case FZ_DICT: return "dictionary"; case FZ_INDIRECT: return "reference"; - case FZ_POINTER: return "pointer"; } return "<unknown>"; } |