[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/dictionary.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/dictionary.c |
Date: |
Mon, 16 May 2005 03:33:33 -0400 |
Index: pspp/src/dictionary.c
diff -u pspp/src/dictionary.c:1.22 pspp/src/dictionary.c:1.23
--- pspp/src/dictionary.c:1.22 Thu May 5 06:59:54 2005
+++ pspp/src/dictionary.c Mon May 16 07:33:17 2005
@@ -268,7 +268,7 @@
/* Allocate and initialize variable. */
v = xmalloc (sizeof *v);
- st_trim_copy (v->name, name, sizeof v->name);
+ str_copy_trunc (v->name, sizeof v->name, name);
v->type = width == 0 ? NUMERIC : ALPHA;
v->width = width;
v->fv = d->next_value_idx;
@@ -395,7 +395,7 @@
assert (d != NULL);
assert (name != NULL);
- st_trim_copy (v.name, name, sizeof v.name);
+ str_copy_trunc (v.name, sizeof v.name, name);
return hsh_find (d->name_tab, &v);
}
@@ -569,7 +569,7 @@
|| dict_lookup_var (d, new_name) == NULL);
hsh_force_delete (d->name_tab, v);
- st_trim_copy (v->name, new_name, sizeof v->name);
+ str_copy_trunc (v->name, sizeof v->name, new_name);
hsh_force_insert (d->name_tab, v);
if (get_algorithm () == ENHANCED)
@@ -970,7 +970,7 @@
d->vector = xrealloc (d->vector, (d->vector_cnt + 1) * sizeof *d->vector);
vector = d->vector[d->vector_cnt] = xmalloc (sizeof *vector);
vector->idx = d->vector_cnt++;
- st_trim_copy (vector->name, name, sizeof vector->name);
+ str_copy_trunc (vector->name, sizeof vector->name, name);
vector->var = xmalloc (cnt * sizeof *var);
for (i = 0; i < cnt; i++)
{