projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #14822.
[pspp]
/
src
/
matrix-data.c
diff --git
a/src/matrix-data.c
b/src/matrix-data.c
index 776dfa5b1c5908bfe21d8fd21583e83f23d01039..e0dfdcee4c2d036a5179926a0b5124aa9c59dee2 100644
(file)
--- a/
src/matrix-data.c
+++ b/
src/matrix-data.c
@@
-38,6
+38,9
@@
#include "var.h"
#include "vfm.h"
#include "var.h"
#include "vfm.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "debug-print.h"
/* FIXME: /N subcommand not implemented. It should be pretty simple,
#include "debug-print.h"
/* FIXME: /N subcommand not implemented. It should be pretty simple,
@@
-568,7
+571,7
@@
cmd_matrix_data (void)
system file output. */
{
struct variable **v;
system file output. */
{
struct variable **v;
-
size_
t nv;
+
in
t nv;
dict_get_vars (default_dict, &v, &nv, 0);
qsort (v, nv, sizeof *v, compare_variables_by_mxd_var_type);
dict_get_vars (default_dict, &v, &nv, 0);
qsort (v, nv, sizeof *v, compare_variables_by_mxd_var_type);
@@
-884,9
+887,7
@@
static int
di.e = token->string + token->length;
di.v = (union value *) &token->number;
di.f1 = first_column;
di.e = token->string + token->length;
di.v = (union value *) &token->number;
di.f1 = first_column;
- di.format.type = FMT_F;
- di.format.w = token->length;
- di.format.d = 0;
+ di.format = make_output_format (FMT_F, token->length, 0);
if (!data_in (&di))
return 0;
if (!data_in (&di))
return 0;