summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@benzedrine.nwnk.net>2007-06-07 16:01:03 -0400
committerAdam Jackson <ajax@benzedrine.nwnk.net>2007-06-07 16:01:03 -0400
commit1a690feaf7c416da9b01861af381d15a661e5f52 (patch)
tree8aeb4adfc1e3cf945ab8abaaf05fd32f7d8d38b0
parent3b1bcd7676fe810ce60d6a4758067b571796cceb (diff)
Minor fontfile cleanup.
-rw-r--r--include/X11/fonts/bufio.h2
-rw-r--r--src/fontfile/bufio.c22
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);
-}