diff options
| author | Tor Andersson <tor@ghostscript.com> | 2010-06-20 22:35:12 +0200 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2010-06-20 22:35:12 +0200 |
| commit | 5c01ac7712307bb7d1064eacf79befcbe625e2a2 (patch) | |
| tree | d04dff771f746361c7e973e5869653275aee55ea /fitz | |
| parent | b282908b5e1660cd44db89ddbe5ab9af03185295 (diff) | |
| download | mupdf-5c01ac7712307bb7d1064eacf79befcbe625e2a2.tar.xz | |
Rename the remaining non-reference-counted free functions to free instead of drop.
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/base_hash.c | 2 | ||||
| -rw-r--r-- | fitz/fitz_base.h | 2 | ||||
| -rw-r--r-- | fitz/stm_misc.c | 3 | ||||
| -rw-r--r-- | fitz/stm_open.c | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/fitz/base_hash.c b/fitz/base_hash.c index 8b1db399..9f96b75d 100644 --- a/fitz/base_hash.c +++ b/fitz/base_hash.c @@ -87,7 +87,7 @@ fz_hashgetval(fz_hashtable *table, int idx) } void -fz_drophash(fz_hashtable *table) +fz_freehash(fz_hashtable *table) { fz_free(table->ents); fz_free(table); diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h index 94197a1a..77ff594c 100644 --- a/fitz/fitz_base.h +++ b/fitz/fitz_base.h @@ -177,7 +177,7 @@ typedef struct fz_hashtable_s fz_hashtable; fz_hashtable * fz_newhash(int initialsize, int keylen); void fz_debughash(fz_hashtable *table); void fz_emptyhash(fz_hashtable *table); -void fz_drophash(fz_hashtable *table); +void fz_freehash(fz_hashtable *table); void *fz_hashfind(fz_hashtable *table, void *key); void fz_hashinsert(fz_hashtable *table, void *key, void *val); diff --git a/fitz/stm_misc.c b/fitz/stm_misc.c index 351cedbf..398d4388 100644 --- a/fitz/stm_misc.c +++ b/fitz/stm_misc.c @@ -40,7 +40,8 @@ fz_readline(fz_stream *stm, char *mem, int n) return fz_okay; } -static inline int fz_fillbuf(fz_stream *stm, fz_buffer *buf) +static inline int +fz_fillbuf(fz_stream *stm, fz_buffer *buf) { int remaining = buf->ep - buf->wp; int available = stm->buffer->wp - stm->buffer->rp; diff --git a/fitz/stm_open.c b/fitz/stm_open.c index c15f803f..793504af 100644 --- a/fitz/stm_open.c +++ b/fitz/stm_open.c @@ -5,7 +5,7 @@ #include "fitz.h" static fz_stream * -newstm(int kind) +fz_newstream(int kind) { fz_stream *stm; @@ -66,7 +66,7 @@ fz_openfile(int fd) { fz_stream *stm; - stm = newstm(FZ_SFILE); + stm = fz_newstream(FZ_SFILE); stm->buffer = fz_newbuffer(FZ_BUFSIZE); stm->file = fd; @@ -78,7 +78,7 @@ fz_openfilter(fz_filter *flt, fz_stream *src) { fz_stream *stm; - stm = newstm(FZ_SFILTER); + stm = fz_newstream(FZ_SFILTER); stm->buffer = fz_newbuffer(FZ_BUFSIZE); stm->chain = fz_keepstream(src); stm->filter = fz_keepfilter(flt); @@ -91,7 +91,7 @@ fz_openbuffer(fz_buffer *buf) { fz_stream *stm; - stm = newstm(FZ_SBUFFER); + stm = fz_newstream(FZ_SBUFFER); stm->buffer = fz_keepbuffer(buf); stm->buffer->eof = 1; |