X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fmessage-item.c;h=c60d166779969f8428b1a568a58a0224699b5e7a;hb=bdd73954cd30c51c959205e46c98e5feb4d1df87;hp=a44784fe2eac99b7b8291290366682fdcc83367e;hpb=f4bd801640ccaf1d41f45e0206e01e71d3e18604;p=pspp diff --git a/src/output/message-item.c b/src/output/message-item.c index a44784fe2e..c60d166779 100644 --- a/src/output/message-item.c +++ b/src/output/message-item.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010 Free Sonftware Foundation, Inc. + Copyright (C) 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "libpspp/message.h" #include "output/driver.h" #include "output/output-item-provider.h" +#include "output/text-item.h" #include "gl/xalloc.h" @@ -34,7 +35,6 @@ message_item_create (const struct msg *msg) item = xmalloc (sizeof *msg); output_item_init (&item->output_item, &message_item_class); item->msg = msg_dup (msg); - item->command_name = NULL; return item; } @@ -45,12 +45,18 @@ message_item_get_msg (const struct message_item *item) return item->msg; } +struct text_item * +message_item_to_text_item (struct message_item *message_item) +{ + return text_item_create_nocopy ( + TEXT_ITEM_LOG, msg_to_string (message_item_get_msg (message_item))); +} + static void message_item_destroy (struct output_item *output_item) { struct message_item *item = to_message_item (output_item); msg_destroy (item->msg); - free (item->command_name); free (item); } @@ -64,5 +70,6 @@ message_item_submit (struct message_item *item) const struct output_item_class message_item_class = { + "message", message_item_destroy, };