summaryrefslogtreecommitdiff
path: root/src/GenericParser.h
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:39:47 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:40:08 +0900
commitb1132d6b10cd3791b9529d7031d723fd0e2d8215 (patch)
tree9ce465b42bf09372118335c7c619bb2b41869eaf /src/GenericParser.h
parent4abad2f64c9ff80144a61c5a9c2bea144852b883 (diff)
make clang-format using clang-format-3.6
Diffstat (limited to 'src/GenericParser.h')
-rw-r--r--src/GenericParser.h34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/GenericParser.h b/src/GenericParser.h
index 81805d4c..f3048654 100644
--- a/src/GenericParser.h
+++ b/src/GenericParser.h
@@ -42,15 +42,11 @@
namespace aria2 {
-template<typename Parser, typename ParserStateMachine>
-class GenericParser {
+template <typename Parser, typename ParserStateMachine> class GenericParser {
public:
- GenericParser()
- : parser_{&psm_}
- {}
+ GenericParser() : parser_{&psm_} {}
- ~GenericParser()
- {}
+ ~GenericParser() {}
typedef typename ParserStateMachine::ResultType ResultType;
typedef ParserStateMachine ParserStateMachineType;
@@ -68,43 +64,45 @@ public:
// number of bytes processed (>= 0). On error, it will be one of the
// negative error code. This function also resets underlying parser
// facility and make it ready to reuse.
- ResultType
- parseFinal(const char* data, size_t size, ssize_t& error)
+ ResultType parseFinal(const char* data, size_t size, ssize_t& error)
{
ResultType res;
error = parser_.parseFinal(data, size);
- if(error < 0) {
+ if (error < 0) {
res = ParserStateMachine::noResult();
- } else {
+ }
+ else {
res = psm_.getResult();
}
parser_.reset();
return res;
}
+
private:
ParserStateMachine psm_;
Parser parser_;
};
-template<typename Parser>
+template <typename Parser>
typename Parser::ResultType parseFile(Parser& parser,
const std::string& filename)
{
int fd;
// TODO Overrode a2open(const char*,..) and a2open(const std::wstring&,..)
- while((fd = a2open(utf8ToWChar(filename).c_str(),
- O_BINARY | O_RDONLY, OPEN_MODE)) == -1
- && errno != EINTR);
- if(fd == -1) {
+ while ((fd = a2open(utf8ToWChar(filename).c_str(), O_BINARY | O_RDONLY,
+ OPEN_MODE)) == -1 &&
+ errno != EINTR)
+ ;
+ if (fd == -1) {
return Parser::ParserStateMachineType::noResult();
}
auto fdclose = defer(fd, close);
std::array<char, 4_k> buf;
ssize_t nread;
ssize_t nproc;
- while((nread = read(fd, buf.data(), buf.size())) > 0) {
+ while ((nread = read(fd, buf.data(), buf.size())) > 0) {
nproc = parser.parseUpdate(buf.data(), nread);
- if(nproc < 0) {
+ if (nproc < 0) {
break;
}
}