Better naming for bitmask signature.

[apitrace] / trace_writer.cpp

diff --git a/trace_writer.cpp b/trace_writer.cpp
index d07fdf91799411cbcd9211d82e0d4cf471aff515..19f7cc01768f199480b447e87d9e45319ad5f662 100644 (file)
--- a/trace_writer.cpp
+++ b/trace_writer.cpp
@@ -330,13 +330,13 @@ void Writer::writeBitmask(const BitmaskSig &bitmask, unsigned long long value) {
     _writeByte(Trace::TYPE_BITMASK);
     _writeUInt(bitmask.id);
     if (!lookup(bitmasks, bitmask.id)) {
-        _writeUInt(bitmask.count);
-        for (unsigned i = 0; i < bitmask.count; ++i) {
-            if (i != 0 && bitmask.values[i].value == 0) {
-                OS::DebugMessage("apitrace: bitmask %s is zero but is not first flag\n", bitmask.values[i].name);
+        _writeUInt(bitmask.num_flags);
+        for (unsigned i = 0; i < bitmask.num_flags; ++i) {
+            if (i != 0 && bitmask.flags[i].value == 0) {
+                OS::DebugMessage("apitrace: bitmask %s is zero but is not first flag\n", bitmask.flags[i].name);
             }
-            _writeString(bitmask.values[i].name);
-            _writeUInt(bitmask.values[i].value);
+            _writeString(bitmask.flags[i].name);
+            _writeUInt(bitmask.flags[i].value);
         }
         bitmasks[bitmask.id] = true;
     }