X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=8800d0bdf4e0e87cbba8f89ec872029181395f59;hb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;hp=ea2907ffe9b68ca7a69a43291b26a9c57af42ba6;hpb=8d6bfdd2a100bf8166b3b0b3f006d46f3e7a59e9;p=pspp

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index ea2907ffe9..8800d0bdf4 100644
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -1,21 +1,18 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
-
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #undef VERSION
 #include <config.h>
@@ -141,7 +138,7 @@ scalar_to_value (union value *val, SV *scalar, const struct variable *var)
 	const char *p = SvPV (scalar, len);
 	int width = var_get_width (var);
 	value_set_missing (val, width);
-	memcpy (value_str_rw (val, width), p, len);
+	memcpy (val->s, p, len);
     }
 }
 
@@ -159,7 +156,7 @@ value_to_scalar (const union value *val, const struct variable *var)
   else
     {
       int width = var_get_width (var);
-      return newSVpvn (value_str (val, width), width);
+      return newSVpvn (val->s, width);
     }
 }
 
@@ -412,12 +409,15 @@ INIT:
   croak ("No more than 3 missing values are permitted");
 
  for (i = 0; i < items - 1; ++i)
-   scalar_to_value (&val[i], ST(i+1), var);
+   make_value_from_scalar (&val[i], ST(i+1), var);
 CODE:
  struct missing_values mv;
  mv_init (&mv, var_get_width (var));
  for (i = 0 ; i < items - 1; ++i )
-   mv_add_value (&mv, &val[i]);
+   {
+     mv_add_value (&mv, &val[i]);
+     value_destroy (&val[i], var_get_width (var));
+   }
  var_set_missing_values (var, &mv);
 
 
@@ -589,7 +589,6 @@ get_value_labels (var)
 CODE:
  HV *labelhash = (HV *) sv_2mortal ((SV *) newHV());
  const struct val_lab *vl;
- struct val_labs_iterator *viter = NULL;
  const struct val_labs *labels = var_get_value_labels (var);
 
  if ( labels )
@@ -648,7 +647,7 @@ CODE:
  swi->opened = true;
  swi->dict_sv = dict_sv;
  SvREFCNT_inc (swi->dict_sv);
- 
+
  RETVAL = swi;
  OUTPUT:
 RETVAL
@@ -752,7 +751,6 @@ struct sysreader_info *
 pxs_open_sysfile (name)
  char * name
 CODE:
- struct casereader *reader;
  struct sysreader_info *sri = NULL;
  struct file_handle *fh =
    fh_create_file (NULL, name, "UTF-8", fh_default_properties () );
@@ -789,7 +787,7 @@ CODE:
  casenumber n = casereader_get_case_cnt (sfr->reader);
  if (n == CASENUMBER_MAX)
   ret = &PL_sv_undef;
- else 
+ else
   ret = newSViv (n);
  RETVAL = ret;
  OUTPUT: