diff options
| -rw-r--r-- | include/X11/fonts/bufio.h | 2 | ||||
| -rw-r--r-- | src/fontfile/bufio.c | 22 |
2 files changed, 8 insertions, 16 deletions
diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h index da90064..b31b813 100644 --- a/include/X11/fonts/bufio.h +++ b/include/X11/fonts/bufio.h @@ -72,10 +72,8 @@ extern BufFilePtr BufFilePushCompressed ( BufFilePtr ); extern BufFilePtr BufFilePushZIP ( BufFilePtr ); #endif extern int BufFileClose ( BufFilePtr, int ); -extern int BufFileFlush ( BufFilePtr, int ); extern int BufFileRead ( BufFilePtr, char*, int ); extern int BufFileWrite ( BufFilePtr, char*, int ); -extern void BufFileFree ( BufFilePtr ); #define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : ((f)->eof = (*(f)->input) (f))) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = ((unsigned char)(c)) : (*(f)->output) ((unsigned char)(c),f)) diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c index 43c6a13..a5746e3 100644 --- a/src/fontfile/bufio.c +++ b/src/fontfile/bufio.c @@ -147,6 +147,14 @@ BufFileRawFlush (int c, BufFilePtr f) return c; } +static int +BufFileFlush (BufFilePtr f, int doClose) +{ + if (f->bufp != f->buffer) + return (*f->output) (BUFFILEEOF, f); + return 0; +} + BufFilePtr BufFileOpenWrite (int fd) { @@ -189,14 +197,6 @@ BufFileWrite (BufFilePtr f, char *b, int n) } int -BufFileFlush (BufFilePtr f, int doClose) -{ - if (f->bufp != f->buffer) - return (*f->output) (BUFFILEEOF, f); - return 0; -} - -int BufFileClose (BufFilePtr f, int doClose) { int ret; @@ -204,9 +204,3 @@ BufFileClose (BufFilePtr f, int doClose) xfree (f); return ret; } - -void -BufFileFree (BufFilePtr f) -{ - xfree (f); -} |