projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Append $(EXEEXT_FOR_BUILD) to output file name when building q2c.
[pspp-builds.git]
/
src
/
language
/
data-io
/
list.q
diff --git
a/src/language/data-io/list.q
b/src/language/data-io/list.q
index 1df9411163a5d81b82dc0da670aa702601ac4fa4..8e8bba9b69a281ae707cd021d2bd777e0176bf6f 100644
(file)
--- a/
src/language/data-io/list.q
+++ b/
src/language/data-io/list.q
@@
-16,24
+16,25
@@
#include <config.h>
#include <config.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include "intprops.h"
#include <stdio.h>
#include <stdlib.h>
#include "intprops.h"
-#include "size_max.h"
+#include "xmalloca.h"
+
#include <data/casegrouper.h>
#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/data-out.h>
#include <data/format.h>
#include <data/procedure.h>
#include <data/casegrouper.h>
#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/data-out.h>
#include <data/format.h>
#include <data/procedure.h>
+#include <data/short-names.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <data/variable.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/compiler.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@
-43,6
+44,7
@@
#include <output/table.h>
#include "minmax.h"
#include <output/table.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-141,15
+143,15
@@
cmd_list (struct lexer *lexer, struct dataset *ds)
return CMD_FAILURE;
/* Fill in defaults. */
return CMD_FAILURE;
/* Fill in defaults. */
- if (cmd.step ==
NOT_LONG
)
+ if (cmd.step ==
LONG_MIN
)
cmd.step = 1;
cmd.step = 1;
- if (cmd.first ==
NOT_LONG
)
+ if (cmd.first ==
LONG_MIN
)
cmd.first = 1;
cmd.first = 1;
- if (cmd.last ==
NOT_LONG
)
+ if (cmd.last ==
LONG_MIN
)
cmd.last = LONG_MAX;
if (!cmd.sbc_variables)
dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables,
cmd.last = LONG_MAX;
if (!cmd.sbc_variables)
dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables,
-
(1u << DC_SYSTEM) | (1u << DC_SCRATCH)
);
+
DC_SYSTEM | DC_SCRATCH
);
if (cmd.n_variables == 0)
{
msg (SE, _("No variables specified."));
if (cmd.n_variables == 0)
{
msg (SE, _("No variables specified."));
@@
-463,8
+465,8
@@
write_fallback_headers (struct outp_driver *d)
int line_number = 0;
const char *Line = _("Line");
int line_number = 0;
const char *Line = _("Line");
- char *leader =
local_alloc
(strlen (Line)
-
+ INT_STRLEN_BOUND (line_number) + 1 + 1);
+ char *leader =
xmalloca
(strlen (Line)
+ + INT_STRLEN_BOUND (line_number) + 1 + 1);
while (index < cmd.n_variables)
{
while (index < cmd.n_variables)
{
@@
-506,7
+508,7
@@
write_fallback_headers (struct outp_driver *d)
}
{
}
{
- char varname[
LONG
_NAME_LEN + 2];
+ char varname[
VAR
_NAME_LEN + 2];
snprintf (varname, sizeof varname,
" %s", var_get_name (cmd.v_variables[index]));
write_varname (d, varname, leader_width);
snprintf (varname, sizeof varname,
" %s", var_get_name (cmd.v_variables[index]));
write_varname (d, varname, leader_width);
@@
-518,7
+520,7
@@
write_fallback_headers (struct outp_driver *d)
d->cp_x = 0;
d->cp_y += d->font_height;
d->cp_x = 0;
d->cp_y += d->font_height;
-
local_free
(leader);
+
freea
(leader);
}
/* There are three possible layouts for the LIST procedure:
}
/* There are three possible layouts for the LIST procedure: