projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict: Make dict_make_unique_var_name() return an allocated string.
[pspp-builds.git]
/
src
/
data
/
psql-reader.c
diff --git
a/src/data/psql-reader.c
b/src/data/psql-reader.c
index 68ea7e5672cea1c483fb356e75b5834852642c1d..378a56affbb45f66fd04a889fcc8c53d5fc66941 100644
(file)
--- a/
src/data/psql-reader.c
+++ b/
src/data/psql-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 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
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
@@
-180,15
+180,12
@@
create_var (struct psql_reader *r, const struct fmt_spec *fmt,
{
unsigned long int vx = 0;
struct variable *var;
{
unsigned long int vx = 0;
struct variable *var;
- char name[VAR_NAME_LEN + 1];
-
- if ( ! dict_make_unique_var_name (r->dict, suggested_name, &vx, name))
- {
- msg (ME, _("Cannot create variable name from %s"), suggested_name);
- return NULL;
- }
+ char *name;
+ name = dict_make_unique_var_name (r->dict, suggested_name, &vx);
var = dict_create_var (r->dict, name, width);
var = dict_create_var (r->dict, name, width);
+ free (name);
+
var_set_both_formats (var, fmt);
if ( col != -1)
var_set_both_formats (var, fmt);
if ( col != -1)
@@
-286,8
+283,7
@@
psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
}
}
}
}
- r->postgres_epoch =
- calendar_gregorian_to_offset (2000, 1, 1, NULL, NULL);
+ r->postgres_epoch = calendar_gregorian_to_offset (2000, 1, 1, NULL);
/* Create the dictionary and populate it */
/* Create the dictionary and populate it */
@@
-838,7
+834,7
@@
set_value (struct psql_reader *r)
case VARCHAROID:
case BPCHAROID:
case BYTEAOID:
case VARCHAROID:
case BPCHAROID:
case BYTEAOID:
- memcpy (value_str_rw (val, var_width),
(char *)
vptr,
+ memcpy (value_str_rw (val, var_width), vptr,
MIN (length, var_width));
break;
MIN (length, var_width));
break;