diff options
Diffstat (limited to 'libXfont/src/fontfile/bunzip2.c')
| -rw-r--r-- | libXfont/src/fontfile/bunzip2.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libXfont/src/fontfile/bunzip2.c b/libXfont/src/fontfile/bunzip2.c index 007fc7c3c..4078796f4 100644 --- a/libXfont/src/fontfile/bunzip2.c +++ b/libXfont/src/fontfile/bunzip2.c @@ -26,7 +26,9 @@ */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <X11/fonts/fontmisc.h> #include <X11/fonts/bufio.h> @@ -76,7 +78,7 @@ BufFilePushBZIP2 (BufFilePtr f) BufBzip2FileClose); } -static int +static int BufBzip2FileClose(BufFilePtr f, int flag) { xzip_buf *x = (xzip_buf *)f->private; @@ -86,15 +88,15 @@ BufBzip2FileClose(BufFilePtr f, int flag) return 1; } -/* here's the real work. +/* here's the real work. -- we need to put stuff in f.buffer, update f.left and f.bufp, then return the first byte (or BUFFILEEOF). - -- to do this, we need to get stuff into avail_in, and next_in, + -- to do this, we need to get stuff into avail_in, and next_in, and call BZ2_bzDecompress appropriately. -- we may also need to add CRC maintenance - if BZ2_bzDecompress tells us BZ_STREAM_END, we then have 4bytes CRC and 4bytes length... */ -static int +static int BufBzip2FileFill (BufFilePtr f) { xzip_buf *x = (xzip_buf *)f->private; @@ -148,7 +150,7 @@ BufBzip2FileFill (BufFilePtr f) } } f->bufp = x->b; - f->left = BUFFILESIZE - x->z.avail_out; + f->left = BUFFILESIZE - x->z.avail_out; if (f->left >= 0) { f->left--; @@ -159,7 +161,7 @@ BufBzip2FileFill (BufFilePtr f) } /* there should be a BufCommonSkip... */ -static int +static int BufBzip2FileSkip (BufFilePtr f, int c) { /* BufFileRawSkip returns the count unchanged. |