projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: Introduce C_ENCODING as replacement for LEGACY_NATIVE.
[pspp-builds.git]
/
src
/
output
/
tab.c
diff --git
a/src/output/tab.c
b/src/output/tab.c
index f6b4886b1f4837327e830fb44cd0c14114878fe4..fd4685579756dfefda936f95b36597c777262ab4 100644
(file)
--- a/
src/output/tab.c
+++ b/
src/output/tab.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010
, 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
@@
-30,6
+30,7
@@
#include <data/dictionary.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <data/dictionary.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
+#include <libpspp/i18n.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <output/driver.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <output/driver.h>
@@
-416,7
+417,7
@@
tab_fixed (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_pool (&double_value,
LEGACY_NATIVE
, &f, table->container);
+ s = data_out_pool (&double_value,
C_ENCODING
, &f, table->container);
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
@@
-458,7
+459,7
@@
tab_double (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_pool (&double_value,
LEGACY_NATIVE
, fmt, table->container);
+ s = data_out_pool (&double_value,
C_ENCODING
, fmt, table->container);
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
}
table->cc[c + r * table->cf] = s + strspn (s, " ");
table->ct[c + r * table->cf] = opt;
}
@@
-709,6
+710,8
@@
static void
tab_destroy (struct table *table)
{
struct tab_table *t = tab_cast (table);
tab_destroy (struct table *table)
{
struct tab_table *t = tab_cast (table);
+ free (t->title);
+ t->title = NULL;
pool_destroy (t->container);
}
pool_destroy (t->container);
}