From 7918e1fd549adbcf1df30f73914104436504d5e5 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Wed, 8 Nov 2000 06:52:57 +0000 Subject: Move flush_outbuf to the file in which it is used, and by doing so fix a nasty error dealing with two different variables with the same name. --- archival/gunzip.c | 15 --------------- archival/gzip.c | 14 ++++++++++++++ gunzip.c | 15 --------------- gzip.c | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/archival/gunzip.c b/archival/gunzip.c index 1ff3c40fb..70b25bdb0 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -1176,21 +1176,6 @@ void clear_bufs(void) bytes_in = bytes_out = 0L; } -/* =========================================================================== - * Write the output buffer outbuf[0..outcnt-1] and update bytes_out. - * (used for the compressed data only) - */ -void flush_outbuf() -{ - if (outcnt == 0) - return; - - if (!test_mode) - write_buf(ofd, (char *) outbuf, outcnt); - bytes_out += (ulg) outcnt; - outcnt = 0; -} - /* ======================================================================== */ int gunzip_main(int argc, char **argv) { diff --git a/archival/gzip.c b/archival/gzip.c index add94d0d7..2e147b1ca 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -3380,3 +3380,17 @@ unsigned size; isize += (ulg) len; return (int) len; } + +/* =========================================================================== + * Write the output buffer outbuf[0..outcnt-1] and update bytes_out. + * (used for the compressed data only) + */ +void flush_outbuf() +{ + if (outcnt == 0) + return; + + write_buf(ofd, (char *) outbuf, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; +} diff --git a/gunzip.c b/gunzip.c index 1ff3c40fb..70b25bdb0 100644 --- a/gunzip.c +++ b/gunzip.c @@ -1176,21 +1176,6 @@ void clear_bufs(void) bytes_in = bytes_out = 0L; } -/* =========================================================================== - * Write the output buffer outbuf[0..outcnt-1] and update bytes_out. - * (used for the compressed data only) - */ -void flush_outbuf() -{ - if (outcnt == 0) - return; - - if (!test_mode) - write_buf(ofd, (char *) outbuf, outcnt); - bytes_out += (ulg) outcnt; - outcnt = 0; -} - /* ======================================================================== */ int gunzip_main(int argc, char **argv) { diff --git a/gzip.c b/gzip.c index add94d0d7..2e147b1ca 100644 --- a/gzip.c +++ b/gzip.c @@ -3380,3 +3380,17 @@ unsigned size; isize += (ulg) len; return (int) len; } + +/* =========================================================================== + * Write the output buffer outbuf[0..outcnt-1] and update bytes_out. + * (used for the compressed data only) + */ +void flush_outbuf() +{ + if (outcnt == 0) + return; + + write_buf(ofd, (char *) outbuf, outcnt); + bytes_out += (ulg) outcnt; + outcnt = 0; +} -- cgit v1.2.3