projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch #6262. New developers guide and resulting fixes and cleanups.
[pspp-builds.git]
/
src
/
data
/
por-file-reader.c
diff --git
a/src/data/por-file-reader.c
b/src/data/por-file-reader.c
index ce1f562f4f9389f323acacdeff5f606e289f68a7..b5486a4a0e3dcfa1ee795869b46a2922fe03b725 100644
(file)
--- a/
src/data/por-file-reader.c
+++ b/
src/data/por-file-reader.c
@@
-33,6
+33,7
@@
#include <data/file-name.h>
#include <data/format.h>
#include <data/missing-values.h>
#include <data/file-name.h>
#include <data/format.h>
#include <data/missing-values.h>
+#include <data/short-names.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <libpspp/compiler.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <libpspp/compiler.h>
@@
-669,8
+670,8
@@
read_variables (struct pfm_reader *r, struct dictionary *dict)
int i;
for (i = 1; i < 100000; i++)
{
int i;
for (i = 1; i < 100000; i++)
{
- char try_name[
LONG
_NAME_LEN + 1];
- sprintf (try_name, "%.*s_%d",
LONG
_NAME_LEN - 6, name, i);
+ char try_name[
VAR
_NAME_LEN + 1];
+ sprintf (try_name, "%.*s_%d",
VAR
_NAME_LEN - 6, name, i);
v = dict_create_var (dict, try_name, width);
if (v != NULL)
break;
v = dict_create_var (dict, try_name, width);
if (v != NULL)
break;
@@
-692,12
+693,12
@@
read_variables (struct pfm_reader *r, struct dictionary *dict)
{
double x = read_float (r);
double y = read_float (r);
{
double x = read_float (r);
double y = read_float (r);
- mv_add_
num_
range (&miss, x, y);
+ mv_add_range (&miss, x, y);
}
else if (match (r, 'A'))
}
else if (match (r, 'A'))
- mv_add_
num_
range (&miss, read_float (r), HIGHEST);
+ mv_add_range (&miss, read_float (r), HIGHEST);
else if (match (r, '9'))
else if (match (r, '9'))
- mv_add_
num_
range (&miss, LOWEST, read_float (r));
+ mv_add_range (&miss, LOWEST, read_float (r));
/* Single missing values. */
while (match (r, '8'))
/* Single missing values. */
while (match (r, '8'))