Make windows build user friendlier.

[apitrace] / trace_parser.cpp

diff --git a/trace_parser.cpp b/trace_parser.cpp
index da9d8a487c4ccefa1dfdf9c66db86509df528b08..1d3c08ad62e0561da4fe2df60a6df36c2305fa1a 100644 (file)
--- a/trace_parser.cpp
+++ b/trace_parser.cpp
@@ -140,6 +140,7 @@ void Parser::parse_enter(void) {
     FunctionSig *sig = lookup(functions, id);
     if (!sig) {
         sig = new FunctionSig;
+        sig->id = id;
         sig->name = read_string();
         sig->num_args = read_uint();
         const char **arg_names = new const char *[sig->num_args];
@@ -330,19 +331,18 @@ Value *Parser::parse_bitmask() {
     size_t id = read_uint();
     BitmaskSig *sig = lookup(bitmasks, id);
     if (!sig) {
-        size_t count = read_uint();
-        BitmaskVal *values = new BitmaskVal[count];
-        for (BitmaskVal *it = values; it != values + count; ++it) {
+        sig = new BitmaskSig;
+        sig->id = id;
+        sig->num_flags = read_uint();
+        BitmaskFlag *flags = new BitmaskFlag[sig->num_flags];
+        for (BitmaskFlag *it = flags; it != flags + sig->num_flags; ++it) {
             it->name = read_string();
             it->value = read_uint();
-            if (it->value == 0 && it != values) {
+            if (it->value == 0 && it != flags) {
                 std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
             }
         }
-        sig = new BitmaskSig;
-        sig->id = id;
-        sig->count = count;
-        sig->values = values;
+        sig->flags = flags;
         bitmasks[id] = sig;
     }
     assert(sig);