projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cairo: Support scaling tables to fit page width and page length.
[pspp]
/
src
/
output
/
message-item.c
diff --git
a/src/output/message-item.c
b/src/output/message-item.c
index a44784fe2eac99b7b8291290366682fdcc83367e..c60d166779969f8428b1a568a58a0224699b5e7a 100644
(file)
--- a/
src/output/message-item.c
+++ b/
src/output/message-item.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2010 Free So
n
ftware 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
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 "libpspp/message.h"
#include "output/driver.h"
#include "output/output-item-provider.h"
+#include "output/text-item.h"
#include "gl/xalloc.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 = xmalloc (sizeof *msg);
output_item_init (&item->output_item, &message_item_class);
item->msg = msg_dup (msg);
- item->command_name = NULL;
return item;
}
return item;
}
@@
-45,12
+45,18
@@
message_item_get_msg (const struct message_item *item)
return item->msg;
}
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);
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);
}
free (item);
}
@@
-64,5
+70,6
@@
message_item_submit (struct message_item *item)
const struct output_item_class message_item_class =
{
const struct output_item_class message_item_class =
{
+ "message",
message_item_destroy,
};
message_item_destroy,
};