projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed my authorship lines.
[pspp-builds.git]
/
src
/
output
/
table.c
diff --git
a/src/output/table.c
b/src/output/table.c
index 029fd5d07ddc57db49395c02717e45664d93ab57..a6e9f66f80e8b4e90d1e57fc94aeb4bafe2f6c91 100644
(file)
--- a/
src/output/table.c
+++ b/
src/output/table.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-29,8
+28,9
@@
#include "output.h"
#include "manager.h"
#include "output.h"
#include "manager.h"
+#include <data/data-out.h>
#include <data/format.h>
#include <data/format.h>
-#include <data/va
riabl
e.h>
+#include <data/va
lu
e.h>
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
@@
-141,8
+141,8
@@
tab_realloc (struct tab_table *t, int nc, int nr)
if (nc > t->cf)
{
if (nc > t->cf)
{
- int mr1 =
min
(nr, t->nr);
- int mc1 =
min
(nc, t->nc);
+ int mr1 =
MIN
(nr, t->nr);
+ int mc1 =
MIN
(nc, t->nc);
struct substring *new_cc;
unsigned char *new_ct;
struct substring *new_cc;
unsigned char *new_ct;
@@
-541,7
+541,7
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
table->cc[c + r * table->cf] = ss_buffer (contents, f->w);
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = ss_buffer (contents, f->w);
table->ct[c + r * table->cf] = opt;
- data_out (
contents, f, v
);
+ data_out (
v, f, contents
);
}
/* Sets cell (C,R) in TABLE, with options OPT, to have value VAL
}
/* Sets cell (C,R) in TABLE, with options OPT, to have value VAL
@@
-580,7
+580,7
@@
tab_float (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- data_out (
buf, &f, &double_value
);
+ data_out (
&double_value, &f, buf
);
cp = buf;
while (isspace ((unsigned char) *cp) && cp < &buf[w])
cp = buf;
while (isspace ((unsigned char) *cp) && cp < &buf[w])