X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Foutput%2Fpivot-table-test.c;h=7aef458d2479fa4f44451f9b3af67e3fd69357d0;hb=142f8f8814423f76523825f8df060e2fa9d2a2b6;hp=cf476d5392c97d8c0ba6581791ca503666d96305;hpb=321290aa58ad553951a4448ea512ebeed4ddf9b1;p=pspp

diff --git a/tests/output/pivot-table-test.c b/tests/output/pivot-table-test.c
index cf476d5392..7aef458d24 100644
--- a/tests/output/pivot-table-test.c
+++ b/tests/output/pivot-table-test.c
@@ -53,7 +53,7 @@ static const char *output_base = "render";
 static const char *parse_options (int argc, char **argv);
 static void usage (void) NO_RETURN;
 static void read_table (struct lexer *);
-static void output_msg (const struct msg *, void *);
+static void output_msg (const struct msg *, struct lexer *);
 
 int
 main (int argc, char **argv)
@@ -74,7 +74,7 @@ main (int argc, char **argv)
     exit (1);
 
   struct lexer *lexer = lex_create ();
-  msg_set_handler (output_msg, lexer);
+  lex_set_message_handler (lexer, output_msg);
   lex_include (lexer, reader);
   lex_get (lexer);
 
@@ -1224,27 +1224,27 @@ read_table (struct lexer *lexer)
   if (!displayed)
     pivot_table_submit (pt);
   else
-    pivot_table_unshare (pt);
+    pivot_table_unref (pt);
 
   force_match (lexer, T_ENDCMD);
 }
 
 static void
-output_msg (const struct msg *m_, void *lexer_)
+output_msg (const struct msg *m_, struct lexer *lexer)
 {
-  struct lexer *lexer = lexer_;
-  struct msg m = *m_;
-
-  if (m.file_name == NULL)
-    {
-      m.file_name = CONST_CAST (char *, lex_get_file_name (lexer));
-      m.first_line = lex_get_first_line_number (lexer, 0);
-      m.last_line = lex_get_last_line_number (lexer, 0);
-    }
-
-  m.command_name = output_get_uppercase_command_name ();
+  struct msg m = {
+    .category = m_->category,
+    .severity = m_->severity,
+    .location = (m_->location ? m_->location
+                 : lexer ? lex_get_location (lexer, 0, 0)
+                 : NULL),
+    .command_name = output_get_uppercase_command_name (),
+    .text = m_->text,
+  };
 
   output_item_submit (message_item_create (&m));
 
   free (m.command_name);
+  if (m.location != m_->location)
+    msg_location_destroy (m.location);
 }