projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Smake: Add --doc-base=gl/doc to gnulib-tool invocation, which is
[pspp-builds.git]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index 2479b7c13f404b553504f437d9a229793ef384da..3c8db1cb0a1b4bd334211ee12b72c5e02d5b7338 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-20,21
+20,27
@@
/* FIXME: seems like a lot of code duplication with data-list.c. */
#include <config.h>
/* FIXME: seems like a lot of code duplication with data-list.c. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdlib.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
#include <data/case.h>
#include <data/case.h>
+#include <data/procedure.h>
+#include <data/transformations.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <libpspp/compiler.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/data-writer.h>
-#include <libpspp/message.h>
-#include <language/expressions/public.h>
#include <language/data-io/file-handle.h>
#include <language/data-io/file-handle.h>
+#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <output/manager.h>
#include <output/table.h>
#include <libpspp/misc.h>
#include <output/manager.h>
#include <output/table.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-137,7
+143,7
@@
static int
internal_cmd_print (int f)
{
int table = 0; /* Print table? */
internal_cmd_print (int f)
{
int table = 0; /* Print table? */
- struct print_trns *trns
;
/* malloc()'d transformation. */
+ struct print_trns *trns
= NULL;
/* malloc()'d transformation. */
struct file_handle *fh = NULL;
/* Fill in prt to facilitate error-handling. */
struct file_handle *fh = NULL;
/* Fill in prt to facilitate error-handling. */
@@
-346,7
+352,7
@@
parse_string_argument (void)
{
fx.spec.type = PRT_CONST;
fx.spec.fc = fx.sc - 1;
{
fx.spec.type = PRT_CONST;
fx.spec.fc = fx.sc - 1;
- fx.spec.u.c =
xstrdup (ds_c_str (&tokstr)
);
+ fx.spec.u.c =
ds_xstrdup (&tokstr
);
lex_get ();
/* Parse the included column range. */
lex_get ();
/* Parse the included column range. */
@@
-833,7
+839,7
@@
dump_table (const struct file_handle *fh)
case PRT_SPACE:
break;
case PRT_ERROR:
case PRT_SPACE:
break;
case PRT_ERROR:
-
assert (0
);
+
NOT_REACHED (
);
}
if (fh != NULL)
}
if (fh != NULL)
@@
-878,8
+884,7
@@
alloc_line (void)
break;
case PRT_ERROR:
default:
break;
case PRT_ERROR:
default:
- assert (0);
- abort ();
+ NOT_REACHED ();
}
if (pot_w > w)
w = pot_w;
}
if (pot_w > w)
w = pot_w;
@@
-953,8
+958,7
@@
print_trns_proc (void *trns_, struct ccase *c, int case_num UNUSED)
break;
case PRT_ERROR:
break;
case PRT_ERROR:
- assert (0);
- break;
+ NOT_REACHED ();
}
if (t->writer != NULL && dfm_write_error (t->writer))
}
if (t->writer != NULL && dfm_write_error (t->writer))
@@
-962,7
+966,7
@@
print_trns_proc (void *trns_, struct ccase *c, int case_num UNUSED)
return TRNS_CONTINUE;
}
return TRNS_CONTINUE;
}
-/* Frees all the data inside print_trns
T. Does not free
T. */
+/* Frees all the data inside print_trns
PRT. Does not free PR
T. */
static bool
print_trns_free (void *prt_)
{
static bool
print_trns_free (void *prt_)
{
@@
-983,8
+987,7
@@
print_trns_free (void *prt_)
/* nothing to do */
break;
case PRT_ERROR:
/* nothing to do */
break;
case PRT_ERROR:
- assert (0);
- break;
+ NOT_REACHED ();
}
n = i->next;
free (i);
}
n = i->next;
free (i);
@@
-992,7
+995,6
@@
print_trns_free (void *prt_)
if (prt->writer != NULL)
ok = dfm_close_writer (prt->writer);
free (prt->line);
if (prt->writer != NULL)
ok = dfm_close_writer (prt->writer);
free (prt->line);
- free (prt);
return ok;
}
\f
return ok;
}
\f