variable.c: (var_set_width) traits other than width may also be set

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

diff --git a/src/data/sys-file-private.h b/src/data/sys-file-private.h
index 9d5f52f0ebd304c3c87fd8b26d523b1e47a9f0d8..21ff8ade3a6026fe4e882997292598e83bf4c08e 100644 (file)
--- a/src/data/sys-file-private.h
+++ b/src/data/sys-file-private.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2012 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
@@ -35,10 +35,19 @@
 
 struct dictionary;
 
+/* Magic numbers.
+
+   Both of these are actually $FL2 in the respective character set.  The "FL2"
+   part is invariant among national variants of each character set, but "$" has
+   different encodings, so it is safer to write them as hexadecimal. */
+#define ASCII_MAGIC  "\x24\x46\x4c\x32"
+#define EBCDIC_MAGIC "\x5b\xc6\xd3\xf2"
+
 /* A variable in a system file. */
 struct sfm_var
   {
-    int width;                  /* Value width (0=numeric, else string). */
+    int var_width;              /* Variable width (0 to 32767). */
+    int segment_width;          /* Segment width (0 to 255). */
     int case_index;             /* Index into case. */
 
     /* The following members are interesting only for string
@@ -59,4 +68,17 @@ int sfm_width_to_segments (int width);
 int sfm_segment_effective_offset (int width, int segment);
 int sfm_segment_alloc_width (int width, int segment);
 
+/* A mapping between an encoding name and a Windows codepage. */
+struct sys_encoding
+  {
+    int number;
+    const char *name;
+  };
+
+extern struct sys_encoding sys_codepage_number_to_name[];
+extern struct sys_encoding sys_codepage_name_to_number[];
+
+int sys_get_codepage_from_encoding (const char *);
+const char *sys_get_encoding_from_codepage (int);
+
 #endif /* data/sys-file-private.h */