emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move flush_outbuf to the file in which it is used, and by doing so fix a

Browse Source 
nasty error dealing with two different variables with the same name.
This commit is contained in:
Matt Kraai 2000-11-08 06:52:57 +00:00
parent d8ad76cb31
commit 7918e1fd54
4 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archival/gunzip.c
View File

@ -1176,21 +1176,6 @@ void clear_bufs(void)
bytes_in = bytes_out = 0L; 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) int gunzip_main(int argc, char **argv)
{ {

14
archival/gzip.c
View File

@ -3380,3 +3380,17 @@ unsigned size;
isize += (ulg) len; isize += (ulg) len;
return (int) 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;
}

15
gunzip.c
View File

@ -1176,21 +1176,6 @@ void clear_bufs(void)
bytes_in = bytes_out = 0L; 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) int gunzip_main(int argc, char **argv)
{ {

14
gzip.c
View File

@ -3380,3 +3380,17 @@ unsigned size;
isize += (ulg) len; isize += (ulg) len;
return (int) 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;
}