X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fjournal.c;h=92fa793be1db62ebaae4575732b6e5e8b5e60401;hb=f967d0e36a2193c1249799f463ea9109b753f7a8;hp=84d0cd922266c0dbe1d745af84a8005fc6b7de42;hpb=f2d4cc6e7a4d5948a2c0cf70883347000a79a2b0;p=pspp diff --git a/src/output/journal.c b/src/output/journal.c index 84d0cd9222..92fa793be1 100644 --- a/src/output/journal.c +++ b/src/output/journal.c @@ -41,7 +41,6 @@ struct journal_driver { struct output_driver driver; FILE *file; - char *command_name; /* Name of journal file. */ char *file_name; @@ -80,10 +79,7 @@ journal_destroy (struct output_driver *driver) struct journal_driver *j = journal_driver_cast (driver); if ( !j->destroyed) - { - journal_close (); - free (j->command_name); - } + journal_close (); j->destroyed = true; } @@ -107,8 +103,6 @@ journal_submit (struct output_driver *driver, const struct output_item *item) { struct journal_driver *j = journal_driver_cast (driver); - output_driver_track_current_command (item, &j->command_name); - if (is_text_item (item)) { const struct text_item *text_item = to_text_item (item); @@ -120,8 +114,7 @@ journal_submit (struct output_driver *driver, const struct output_item *item) else if (is_message_item (item)) { const struct message_item *message_item = to_message_item (item); - const struct msg *msg = message_item_get_msg (message_item); - char *s = msg_to_string (msg, j->command_name); + char *s = msg_to_string (message_item_get_msg (message_item)); journal_output (j, s); free (s); } @@ -145,8 +138,7 @@ journal_init (void) output_driver_init (&journal.driver, &journal_class, "journal", SETTINGS_DEVICE_UNFILTERED); journal.file = NULL; - journal.command_name = NULL; - + /* Register journal driver. */ output_driver_register (&journal.driver);