work on docs

[pspp] / perl-module / PSPP.xs

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index 46e9ba132d094fe446444d1ba4a047793cce0881..077bf581f0031cfe27332efbbf54c2dbec6e04a3 100644 (file)
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -149,7 +149,7 @@ value_to_scalar (const union value *val, const struct variable *var)
 {
   if ( var_is_numeric (var))
     {
-      if ( var_is_value_missing (var, val, MV_SYSTEM))
+      if (var_is_value_missing (var, val) == MV_SYSTEM)
        return newSVpvn ("", 0);
 
       return newSVnv (val->f);
@@ -157,7 +157,7 @@ value_to_scalar (const union value *val, const struct variable *var)
   else
     {
       int width = var_get_width (var);
-      return newSVpvn (val->s, width);
+      return newSVpvn ((char *) val->s, width);
     }
 }
 
@@ -208,7 +208,8 @@ CODE:
  assert (0 == strncmp (ver, bare_version, strlen (ver)));
 
  i18n_init ();
- msg_set_handler (message_handler, NULL);
+const struct msg_handler mh = { .output_msg = message_handler };
+ msg_set_handler (&mh);
  settings_init ();
  fh_init ();
 
@@ -239,7 +240,7 @@ CODE:
  union value uv;
  int ret;
  make_value_from_scalar (&uv, val, var);
- ret = var_is_value_missing (var, &uv, MV_ANY);
+ ret = var_is_value_missing (var, &uv) != 0;
  value_destroy (&uv, var_get_width (var));
  RETVAL = ret;
  OUTPUT:
@@ -280,7 +281,7 @@ int
 get_var_cnt (dict)
  struct pspp_dict *dict
 CODE:
- RETVAL = dict_get_var_cnt (dict->dict);
+ RETVAL = dict_get_n_vars (dict->dict);
 OUTPUT:
 RETVAL
 
@@ -329,7 +330,7 @@ pxs_get_variable (dict, idx)
 INIT:
  SV *errstr = get_sv("PSPP::errstr", TRUE);
  sv_setpv (errstr, "");
- if ( SvIV (idx) >= dict_get_var_cnt (dict->dict))
+ if ( SvIV (idx) >= dict_get_n_vars (dict->dict))
   {
     sv_setpv (errstr, "The dictionary doesn't have that many variables.");
     XSRETURN_UNDEF;
@@ -688,7 +689,7 @@ CODE:
  size_t nv;
  struct ccase *c;
 
- if ( av_len (av_case) >= dict_get_var_cnt (swi->dict->dict))
+ if ( av_len (av_case) >= dict_get_n_vars (swi->dict->dict))
    XSRETURN_UNDEF;
 
  c =  case_create (dict_get_proto (swi->dict->dict));
@@ -730,7 +731,7 @@ CODE:
   }
 
  /* The remaining variables must be sysmis or blank string */
- while (i < dict_get_var_cnt (swi->dict->dict))
+ while (i < dict_get_n_vars (swi->dict->dict))
  {
    const struct variable *v = vv[i++];
    union value *val = case_data_rw (c, v);
@@ -785,7 +786,7 @@ get_case_cnt (sfr)
  struct sysreader_info *sfr;
 CODE:
  SV *ret;
- casenumber n = casereader_get_case_cnt (sfr->reader);
+ casenumber n = casereader_get_n_cases (sfr->reader);
  if (n == CASENUMBER_MAX)
   ret = &PL_sv_undef;
  else
@@ -806,8 +807,8 @@ PPCODE:
  {
   int v;
 
-  EXTEND (SP, dict_get_var_cnt (sfr->dict->dict));
-  for (v = 0; v < dict_get_var_cnt (sfr->dict->dict); ++v )
+  EXTEND (SP, dict_get_n_vars (sfr->dict->dict));
+  for (v = 0; v < dict_get_n_vars (sfr->dict->dict); ++v )
     {
       const struct variable *var = dict_get_var (sfr->dict->dict, v);
       const union value *val = case_data (c, var);