Moved xact_xdata_t into xact_t itself, as a set of "extended data" that might

be gathered during reporting.

Removed the references to accounts and such from the mask logic, which means
that the value expression "acount =~ /foo/" is needed in place of just
"/foo/".

1 files changed, 3 insertions, 4 deletions

diff --git a/csv.cc b/csv.cc
index 7c8a92e0..e61e04a6 100644
--- a/csv.cc
+++ b/csv.cc
@@ -19,9 +19,8 @@ namespace {
 
 void format_csv_xacts::operator()(xact_t& xact)
 {
-  if (! xact_has_xdata(xact) ||
-      ! (xact_xdata_(xact).dflags & XACT_DISPLAYED)) {
-
+  if (! xact.has_xdata() ||
+      ! xact.xdata().has_flags(XACT_EXT_DISPLAYED)) {
     {
       format_t fmt("%D");
       std::ostringstream str;
@@ -111,7 +110,7 @@ void format_csv_xacts::operator()(xact_t& xact)
     }
     out << '\n';
 
-    xact_xdata(xact).dflags |= XACT_DISPLAYED;
+    xact.xdata().add_flags(XACT_EXT_DISPLAYED);
   }
 }