github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Use stack allocation+reference instead of pointer for BufferedFile

pull/22/head
Tatsuhiro Tsujikawa 2012-06-27 01:38:27 +09:00
parent a6775db3ca
commit 68f225de0b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ExpatXmlParser.cc
View File

@ -160,26 +160,26 @@ XML_Parser createParser(SessionData* sd)
bool XmlParser::parseFile(const char* filename) bool XmlParser::parseFile(const char* filename)
{ {
BufferedFile* fp = 0;
if(strcmp(filename, DEV_STDIN) == 0) { if(strcmp(filename, DEV_STDIN) == 0) {
fp = new BufferedFile(stdin); BufferedFile fp(stdin);
auto_delete_d<BufferedFile*> deleter(fp);
return parseFile(fp); return parseFile(fp);
} else { } else {
fp = new BufferedFile(filename, BufferedFile::READ); BufferedFile fp(filename, BufferedFile::READ);
auto_delete_d<BufferedFile*> deleter(fp);
return parseFile(fp); return parseFile(fp);
} }
} }
bool XmlParser::parseFile(BufferedFile* fp) bool XmlParser::parseFile(BufferedFile& fp)
{ {
if(!fp) {
return false;
}
char buf[4096]; char buf[4096];
SessionData sessionData(psm_); SessionData sessionData(psm_);
XML_Parser parser = createParser(&sessionData); XML_Parser parser = createParser(&sessionData);
auto_delete<XML_Parser> deleter(parser, XML_ParserFree); auto_delete<XML_Parser> deleter(parser, XML_ParserFree);
while(1) { while(1) {
size_t res = fp->read(buf, sizeof(buf)); size_t res = fp.read(buf, sizeof(buf));
if(XML_Parse(parser, buf, res, 0) == XML_STATUS_ERROR) { if(XML_Parse(parser, buf, res, 0) == XML_STATUS_ERROR) {
return false; return false;
} }

2
src/ExpatXmlParser.h
View File

@ -54,7 +54,7 @@ public:
bool parseBinaryStream(BinaryStream* binaryStream); bool parseBinaryStream(BinaryStream* binaryStream);
bool parseMemory(const char* xml, size_t size); bool parseMemory(const char* xml, size_t size);
private: private:
bool parseFile(BufferedFile* fp); bool parseFile(BufferedFile& fp);
ParserStateMachine* psm_; ParserStateMachine* psm_;
}; };