[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[VAR_NAME_LEN 09/17] VECTOR: Eliminate VAR_NAME_LEN limit for variable n
From: |
Ben Pfaff |
Subject: |
[VAR_NAME_LEN 09/17] VECTOR: Eliminate VAR_NAME_LEN limit for variable names. |
Date: |
Sat, 5 Feb 2011 13:25:51 -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/language/dictionary/vector.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c
index 3be0723..8eb7ef1 100644
--- a/src/language/dictionary/vector.c
+++ b/src/language/dictionary/vector.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 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
@@ -159,18 +159,20 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[VAR_NAME_LEN + INT_STRLEN_BOUND (int) + 1];
- sprintf (name, "%s%d", vectors[i], j + 1);
+ char *name = xasprintf ("%s%d", vectors[i], j + 1);
if (strlen (name) > VAR_NAME_LEN)
{
+ free (name);
msg (SE, _("%s is too long for a variable name."), name);
goto fail;
}
if (dict_lookup_var (dict, name))
{
+ free (name);
msg (SE, _("%s is an existing variable name."), name);
goto fail;
}
+ free (name);
}
}
@@ -181,10 +183,10 @@ cmd_vector (struct lexer *lexer, struct dataset *ds)
int j;
for (j = 0; j < var_cnt; j++)
{
- char name[VAR_NAME_LEN + 1];
- sprintf (name, "%s%d", vectors[i], j + 1);
+ char *name = xasprintf ("%s%d", vectors[i], j + 1);
vars[j] = dict_create_var_assert (dict, name, 0);
var_set_both_formats (vars[j], &format);
+ free (name);
}
dict_create_vector_assert (dict, vectors[i], vars, var_cnt);
}
--
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 <=
- [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, 2011/02/05
- [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