projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch #6441. Reviewed by John Darrington.
[pspp]
/
src
/
language
/
stats
/
oneway.q
diff --git
a/src/language/stats/oneway.q
b/src/language/stats/oneway.q
index 2522ef5d52eb776a527022668d12d7b7d965ed87..7da992274ea999c8ad488a877264e6dba0aa5327 100644
(file)
--- a/
src/language/stats/oneway.q
+++ b/
src/language/stats/oneway.q
@@
-31,7
+31,6
@@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@
-45,6
+44,8
@@
#include <output/table.h>
#include "sort-criteria.h"
#include <output/table.h>
#include "sort-criteria.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-174,8
+175,7
@@
output_oneway(void)
sum += subc_list_double_at(&cmd.dl_contrast[i],j);
if ( sum != 0.0 )
sum += subc_list_double_at(&cmd.dl_contrast[i],j);
if ( sum != 0.0 )
- msg(SW,_("Coefficients for contrast %d do not total zero"),
- (int) i + 1);
+ msg(SW,_("Coefficients for contrast %zu do not total zero"), i + 1);
}
if ( stat_tables & STAT_DESC )
}
if ( stat_tables & STAT_DESC )
@@
-431,11
+431,17
@@
show_descriptives(void)
for (count = 0 ; count < hsh_count(gp->group_hash) ; ++count)
{
for (count = 0 ; count < hsh_count(gp->group_hash) ; ++count)
{
+ struct string vstr;
+ ds_init_empty (&vstr);
gs = gs_array[count];
gs = gs_array[count];
+ var_append_value_name (indep_var, &gs->id, &vstr);
+
tab_text (t, 1, row + count,
tab_text (t, 1, row + count,
- TAB_LEFT | TAT_TITLE, var_get_value_name(indep_var,
- &gs->id));
+ TAB_LEFT | TAT_TITLE,
+ ds_cstr (&vstr));
+
+ ds_destroy (&vstr);
/* Now fill in the numbers ... */
/* Now fill in the numbers ... */
@@
-618,10
+624,18
@@
show_contrast_coeffs (short *bad_contrast)
++count)
{
int i;
++count)
{
int i;
+ struct string vstr;
group_value = group_values[count];
group_value = group_values[count];
+ ds_init_empty (&vstr);
+
+ var_append_value_name (indep_var, group_value, &vstr);
+
tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE,
tab_text (t, count + 2, 1, TAB_CENTER | TAT_TITLE,
- var_get_value_name (indep_var, group_value));
+ ds_cstr (&vstr));
+
+ ds_destroy (&vstr);
+
for (i = 0 ; i < cmd.sbc_contrast ; ++i )
{
for (i = 0 ; i < cmd.sbc_contrast ; ++i )
{