Re-organize the Trace::File code.

[apitrace] / common / trace_parser.cpp

diff --git a/common/trace_parser.cpp b/common/trace_parser.cpp
index 2eff0cda90bda893c9bbcf64e68c8c23158deff3..0a28f7a8cb47e1b8b32c56414342a547c87fb0b6 100644 (file)
--- a/common/trace_parser.cpp
+++ b/common/trace_parser.cpp
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 
 #include "trace_file.hpp"
-#include "trace_snappyfile.hpp"
 #include "trace_parser.hpp"
 
 
@@ -54,9 +53,9 @@ Parser::~Parser() {
 bool Parser::open(const char *filename) {
     assert(!file);
     if (File::isZLibCompressed(filename)) {
-        file = new ZLibFile;
+        file = File::createZLib();
     } else {
-        file = new SnappyFile;
+        file = File::createSnappy();
     }
 
     if (!file->open(filename, File::Read)) {
@@ -171,7 +170,7 @@ void Parser::setBookmark(const ParseBookmark &bookmark) {
 Call *Parser::parse_call(Mode mode) {
     do {
         int c = read_byte();
-        switch(c) {
+        switch (c) {
         case Trace::EVENT_ENTER:
             parse_enter(mode);
             break;
@@ -228,7 +227,7 @@ FunctionSig *Parser::parse_function_sig(void) {
     } else if (file->currentOffset() < sig->offset) {
         /* skip over the signature */
         skip_string(); /* name */
-        int num_args = read_uint();
+        unsigned num_args = read_uint();
         for (unsigned i = 0; i < num_args; ++i) {
              skip_string(); /*arg_name*/
         }
@@ -373,7 +372,7 @@ Call *Parser::parse_leave(Mode mode) {
 bool Parser::parse_call_details(Call *call, Mode mode) {
     do {
         int c = read_byte();
-        switch(c) {
+        switch (c) {
         case Trace::CALL_END:
             return true;
         case Trace::CALL_ARG:
@@ -409,7 +408,7 @@ Value *Parser::parse_value(void) {
     int c;
     Value *value;
     c = read_byte();
-    switch(c) {
+    switch (c) {
     case Trace::TYPE_NULL:
         value = new Null;
         break;
@@ -470,7 +469,7 @@ Value *Parser::parse_value(void) {
 
 void Parser::scan_value(void) {
     int c = read_byte();
-    switch(c) {
+    switch (c) {
     case Trace::TYPE_NULL:
     case Trace::TYPE_FALSE:
     case Trace::TYPE_TRUE: