TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mike Goslin 2000-12-15 03:14:01 +00:00
parent 530ae20d0c
commit 5d8d9a4892
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/downloader/extractor.cxx
View File

@ -84,6 +84,7 @@ initiate(Filename &source_file, const Filename &rel_path) {
_total_bytes_read = 0; _total_bytes_read = 0;
_read_all_input = false; _read_all_input = false;
_handled_all_input = false; _handled_all_input = false;
_mfile.reset();
return ES_success; return ES_success;
} }
@ -111,7 +112,6 @@ run(void) {
if (_mfile.write(start, size, _rel_path) == true) { if (_mfile.write(start, size, _rel_path) == true) {
_read_stream.close(); _read_stream.close();
_source_file.unlink(); _source_file.unlink();
_mfile.reset();
return ES_success; return ES_success;
} }
return ES_ok; return ES_ok;

16
panda/src/express/multifile.cxx
View File

@ -47,6 +47,7 @@ Multifile::Memfile::
~Memfile(void) { ~Memfile(void) {
if (_buffer != (char *)0L) if (_buffer != (char *)0L)
delete _buffer; delete _buffer;
_buffer = (char *)0L;
delete _header_length_buf; delete _header_length_buf;
} }
@ -61,12 +62,12 @@ reset(void) {
_header_parsed = false; _header_parsed = false;
_header_length = 0; _header_length = 0;
_buffer_length = 0; _buffer_length = 0;
if (_buffer != (char *)0L) //if (_buffer != (char *)0L)
delete _buffer; // delete _buffer;
_buffer = (char *)0L; _buffer = (char *)0L;
_file_open = false; _file_open = false;
_bytes_written = 0; _bytes_written = 0;
_datagram.clear(); //_datagram.clear();
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -583,13 +584,16 @@ write(char *&start, int &size, const Filename &rel_path) {
if (parse_header(start, size) == false) if (parse_header(start, size) == false)
return false; return false;
if (_current_mfile == (Memfile *)0L) //if (_current_mfile == (Memfile *)0L)
_current_mfile = new Memfile; // _current_mfile = new Memfile;
while (_num_mfiles > 0) { while (_num_mfiles > 0) {
if (_current_mfile == NULL)
_current_mfile = new Memfile;
if (_current_mfile->write(start, size, rel_path) == true) { if (_current_mfile->write(start, size, rel_path) == true) {
_num_mfiles--; _num_mfiles--;
_current_mfile->reset(); delete _current_mfile;
// _current_mfile->reset();
} else } else
return false; return false;
} }