projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
data-in: Make data_in() parameters more uniform.
[pspp]
/
perl-module
/
PSPP.xs
diff --git
a/perl-module/PSPP.xs
b/perl-module/PSPP.xs
index fef855106de4347ba324e59434e2e4dd94941b54..bf90d986f327b811fb5f67822d7cf5c332b0c0ca 100644
(file)
--- a/
perl-module/PSPP.xs
+++ b/
perl-module/PSPP.xs
@@
-1,5
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009
, 2010
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-19,6
+19,12
@@
#include <config.h>
#include <config.h>
+/* The Gnulib "strftime" module defines my_strftime in <config.h> for use by
+ gl/strftime.c. Perl also defines my_strftime in embed.h for some other
+ purpose. The former definition doesn't matter in this file, so suppress it
+ to avoid a compiler warning. */
+#undef my_strftime
+
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
@@
-181,11
+187,10
@@
format_value (val, var)
CODE:
SV *ret;
const struct fmt_spec *fmt = var_get_print_format (var);
CODE:
SV *ret;
const struct fmt_spec *fmt = var_get_print_format (var);
- const struct dictionary *dict = var_get_vardict (var)->dict;
union value uv;
char *s;
make_value_from_scalar (&uv, val, var);
union value uv;
char *s;
make_value_from_scalar (&uv, val, var);
- s = data_out (&uv,
dict_get_encoding (dict
), fmt);
+ s = data_out (&uv,
var_get_encoding (var
), fmt);
value_destroy (&uv, var_get_width (var));
ret = newSVpv (s, fmt->w);
free (s);
value_destroy (&uv, var_get_width (var));
ret = newSVpv (s, fmt->w);
free (s);
@@
-649,10
+654,9
@@
CODE:
if ( ifmt )
{
struct substring ss = ss_cstr (SvPV_nolen (sv));
if ( ifmt )
{
struct substring ss = ss_cstr (SvPV_nolen (sv));
- if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0, 0,
- sfi->dict,
- case_data_rw (c, v),
- var_get_width (v)) )
+ if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0,
+ case_data_rw (c, v), var_get_width (v),
+ dict_get_encoding (sfi->dict)))
{
RETVAL = 0;
goto finish;
{
RETVAL = 0;
goto finish;