treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / data / sys-file-private.c

diff --git a/src/data/sys-file-private.c b/src/data/sys-file-private.c
index dd50ea8babefb434edece1080504bcc0f1e22e13..74b0208b9387e9804f6ae725c1cf771ce3de9672 100644 (file)
--- a/src/data/sys-file-private.c
+++ b/src/data/sys-file-private.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 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 published by
@@ -16,16 +16,17 @@
 
 #include <config.h>
 
-#include <data/sys-file-private.h>
+#include "data/sys-file-private.h"
 
-#include <data/dictionary.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
-#include <libpspp/misc.h>
+#include "data/dictionary.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/misc.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/c-strcase.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* Number of bytes really stored in each segment of a very long
    string variable. */
@@ -190,32 +191,32 @@ sfm_segment_effective_offset (int width, int segment)
    user.
 
    The array is allocated with malloc and stored in *SFM_VARS,
-   and its number of elements is stored in *SFM_VAR_CNT.  The
+   and its number of elements is stored in *SFM_N_VARS.  The
    caller is responsible for freeing it when it is no longer
    needed. */
 int
 sfm_dictionary_to_sfm_vars (const struct dictionary *dict,
-                            struct sfm_var **sfm_vars, size_t *sfm_var_cnt)
+                            struct sfm_var **sfm_vars, size_t *sfm_n_vars)
 {
-  size_t var_cnt = dict_get_var_cnt (dict);
-  size_t segment_cnt;
+  size_t n_vars = dict_get_n_vars (dict);
+  size_t n_segments;
   size_t i;
 
   /* Estimate the number of sfm_vars that will be needed.
      We might not need all of these, because very long string
      variables can have segments that are all padding, which do
      not need sfm_vars of their own. */
-  segment_cnt = 0;
-  for (i = 0; i < var_cnt; i++)
+  n_segments = 0;
+  for (i = 0; i < n_vars; i++)
     {
       const struct variable *v = dict_get_var (dict, i);
-      segment_cnt += sfm_width_to_segments (var_get_width (v));
+      n_segments += sfm_width_to_segments (var_get_width (v));
     }
 
   /* Compose the sfm_vars. */
-  *sfm_vars = xnmalloc (segment_cnt, sizeof **sfm_vars);
-  *sfm_var_cnt = 0;
-  for (i = 0; i < var_cnt; i++)
+  *sfm_vars = xnmalloc (n_segments, sizeof **sfm_vars);
+  *sfm_n_vars = 0;
+  for (i = 0; i < n_vars; i++)
     {
       const struct variable *dv = dict_get_var (dict, i);
       int width = var_get_width (dv);
@@ -228,7 +229,7 @@ sfm_dictionary_to_sfm_vars (const struct dictionary *dict,
           struct sfm_var *sv;
           if (used_bytes != 0)
             {
-              sv = &(*sfm_vars)[(*sfm_var_cnt)++];
+              sv = &(*sfm_vars)[(*sfm_n_vars)++];
               sv->var_width = width;
               sv->segment_width = width == 0 ? 0 : used_bytes;
               sv->case_index = var_get_case_index (dv);
@@ -239,12 +240,43 @@ sfm_dictionary_to_sfm_vars (const struct dictionary *dict,
             {
               /* Segment is all padding.  Just add it to the
                  previous segment. */
-              sv = &(*sfm_vars)[*sfm_var_cnt - 1];
+              sv = &(*sfm_vars)[*sfm_n_vars - 1];
               sv->padding += padding;
             }
           assert ((sv->segment_width + sv->padding) % 8 == 0);
         }
     }
 
-  return segment_cnt;
+  return n_segments;
+}
+\f
+/* Given the name of an encoding, returns the codepage number to use in the
+   'character_code' member of the machine integer info record for writing a
+   system file. */
+int
+sys_get_codepage_from_encoding (const char *name)
+{
+  const struct sys_encoding *e;
+
+  for (e = sys_codepage_name_to_number; e->name != NULL; e++)
+    if (!c_strcasecmp (name, e->name))
+      return e->number;
+
+  return 0;
+}
+
+/* Given a codepage number from the 'character_code' member of the machine
+   integer info record in a system file, returns a corresponding encoding name.
+   Most encodings have multiple aliases; the one returned is the one that would
+   be used in the character encoding record. */
+const char *
+sys_get_encoding_from_codepage (int codepage)
+{
+  const struct sys_encoding *e;
+
+  for (e = sys_codepage_number_to_name; e->name != NULL; e++)
+    if (codepage == e->number)
+      return e->name;
+
+  return NULL;
 }