projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ONEWAY: Fix printf format specifier.
[pspp]
/
src
/
output
/
table-casereader.c
diff --git
a/src/output/table-casereader.c
b/src/output/table-casereader.c
index 909a2b5fd00ad9bfcc37441c9f18880faa3e28c5..672dd87f49bc74200400fff3d4a978547af3f3b1 100644
(file)
--- a/
src/output/table-casereader.c
+++ b/
src/output/table-casereader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
, 2011
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
@@
-16,12
+16,12
@@
#include <config.h>
#include <config.h>
-#include
<output/table-provider.h>
+#include
"output/table-provider.h"
-#include
<data/casereader.h>
-#include
<data/data-out.h>
-#include
<data/format.h>
-#include
<libpspp/i18n.h>
+#include
"data/casereader.h"
+#include
"data/data-out.h"
+#include
"data/format.h"
+#include
"libpspp/i18n.h"
#include "gl/xalloc.h"
#include "gl/xalloc.h"
@@
-115,7
+115,8
@@
table_casereader_get_cell (const struct table *t, int x, int y,
{
if (y == 0)
{
{
if (y == 0)
{
- cell->contents = xstrdup (tc->heading);
+ s = xstrdup (tc->heading);
+ cell->contents = s;
cell->destructor = free_string;
cell->destructor_aux = s;
return;
cell->destructor = free_string;
cell->destructor_aux = s;
return;
@@
-141,7
+142,10
@@
table_casereader_get_rule (const struct table *t, enum table_axis axis,
int x UNUSED, int y)
{
struct table_casereader *tc = table_casereader_cast (t);
int x UNUSED, int y)
{
struct table_casereader *tc = table_casereader_cast (t);
- return axis == TABLE_VERT && tc->heading != NULL && y == 1 ? TAL_1 : TAL_0;
+ if (axis == TABLE_VERT)
+ return tc->heading != NULL && y == 1 ? TAL_1 : TAL_0;
+ else
+ return TAL_GAP;
}
static const struct table_class table_casereader_class =
}
static const struct table_class table_casereader_class =