[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[VAR_NAME_LEN 02/17] variable: Remove VAR_NAME_LEN limit for internal re
From: |
Ben Pfaff |
Subject: |
[VAR_NAME_LEN 02/17] variable: Remove VAR_NAME_LEN limit for internal representation of name. |
Date: |
Sat, 5 Feb 2011 13:25:44 -0800 |
Most uses of VAR_NAME_LEN within PSPP are wrong due to encoding issues:
the limit applies to variable names in the encoding used by the data
set, but most uses of VAR_NAME_LEN actually limit the length of a name
in UTF-8. The UTF-8 representation of a name can be longer or shorter
than its representation in the data set encoding, so it seems best to
eliminate references to VAR_NAME_LEN entirely.
---
src/data/variable.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/data/variable.c b/src/data/variable.c
index 707b281..cd8d498 100644
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 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
@@ -45,7 +45,7 @@
struct variable
{
/* Dictionary information. */
- char name[VAR_NAME_LEN + 1]; /* Variable name. Mixed case. */
+ char *name; /* Variable name. Mixed case. */
int width; /* 0 for numeric, otherwise string width. */
struct missing_values miss; /* Missing values. */
struct fmt_spec print; /* Default format for PRINT. */
@@ -91,6 +91,7 @@ var_create (const char *name, int width)
v = xmalloc (sizeof *v);
v->vardict = NULL;
+ v->name = NULL;
var_set_name (v, name);
v->width = width;
mv_init (&v->miss, width);
@@ -155,6 +156,7 @@ var_destroy (struct variable *v)
var_clear_aux (v);
val_labs_destroy (v->val_labs);
var_clear_label (v);
+ free (v->name);
free (v);
}
}
@@ -177,7 +179,8 @@ var_set_name (struct variable *v, const char *name)
assert (!var_has_vardict (v));
assert (var_is_plausible_name (name, false));
- str_copy_trunc (v->name, sizeof v->name, name);
+ free (v->name);
+ v->name = xstrdup (name);
dict_var_changed (v);
}
--
1.7.1
- [VAR_NAME_LEN 00/17] Eliminate uses of VAR_NAME_LEN, Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 08/17] MODIFY VARIABLES: Eliminate VAR_NAME_LEN limit on variable names., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 05/17] FILE HANDLE: Get rid of VAR_NAME_LEN limit on handle name., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 14/17] FLIP: Eliminate false dependency on VAR_NAME_LEN., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 03/17] vector: Remove VAR_NAME_LEN limit for internal representation of name., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 01/17] dict: Make dict_make_unique_var_name() return an allocated string., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 07/17] DATAFILE ATTRIBUTE, VARIABLE ATTRIBUTE: Eliminate VAR_NAME_LEN limit., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 06/17] GET DATA /TYPE=TXT: Get rid of VAR_NAME_LEN limit on variable names., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 09/17] VECTOR: Eliminate VAR_NAME_LEN limit for variable names., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 17/17] por-file-reader: Remove dependency on VAR_NAME_LEN., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 02/17] variable: Remove VAR_NAME_LEN limit for internal representation of name.,
Ben Pfaff <=
- [VAR_NAME_LEN 10/17] DEBUG EVALUATE: Eliminate VAR_NAME_LEN limit., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 04/17] combine-files: Eliminate VAR_NAME_LEN restriction from combine_files()., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 15/17] REGRESSION: Eliminate restriction to VAR_NAME_LEN in reg_get_name()., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 13/17] DESCRIPTIVES: Eliminate main restriction on Z-score variable name length., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 16/17] text-data-import-dialog: Eliminate VAR_NAME_LEN restriction., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 11/17] variable-parser: Rewrite parse_DATA_LIST_vars()., Ben Pfaff, 2011/02/05
- [VAR_NAME_LEN 12/17] variable-parser: Drop VAR_NAME_LEN restriction from var_set_lookup_var_idx()., Ben Pfaff, 2011/02/05
- Re: [VAR_NAME_LEN 00/17] Eliminate uses of VAR_NAME_LEN, John Darrington, 2011/02/08