projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note that gperf is now required.
[pspp]
/
src
/
data
/
any-reader.c
diff --git
a/src/data/any-reader.c
b/src/data/any-reader.c
index 64f881e3e124e2d382ffe0fed927b1bb3c291d88..4951d490ba2484f67e2281b87aaca66ab309ff8e 100644
(file)
--- a/
src/data/any-reader.c
+++ b/
src/data/any-reader.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-24,9
+23,10
@@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include "file-handle-def.h"
#include <libpspp/message.h>
#include "file-handle-def.h"
-#include "filename.h"
+#include "file
-
name.h"
#include "por-file-reader.h"
#include "sys-file-reader.h"
#include <libpspp/str.h>
#include "por-file-reader.h"
#include "sys-file-reader.h"
#include <libpspp/str.h>
@@
-68,17
+68,17
@@
try_detect (struct file_handle *handle, bool (*detect) (FILE *))
FILE *file;
bool is_type;
FILE *file;
bool is_type;
- file = fn_open (fh_get_filename (handle), "rb");
+ file = fn_open (fh_get_file
_
name (handle), "rb");
if (file == NULL)
{
msg (ME, _("An error occurred while opening \"%s\": %s."),
if (file == NULL)
{
msg (ME, _("An error occurred while opening \"%s\": %s."),
- fh_get_filename (handle), strerror (errno));
+ fh_get_file
_
name (handle), strerror (errno));
return IO_ERROR;
}
is_type = detect (file);
return IO_ERROR;
}
is_type = detect (file);
- fn_close (fh_get_filename (handle), file);
+ fn_close (fh_get_file
_
name (handle), file);
return is_type ? YES : NO;
}
return is_type ? YES : NO;
}
@@
-127,7
+127,7
@@
any_reader_open (struct file_handle *handle, struct dictionary **dict)
pfm_open_reader (handle, dict, NULL));
msg (SE, _("\"%s\" is not a system or portable file."),
pfm_open_reader (handle, dict, NULL));
msg (SE, _("\"%s\" is not a system or portable file."),
- fh_get_filename (handle));
+ fh_get_file
_
name (handle));
return NULL;
}
return NULL;
}
@@
-139,7
+139,7
@@
any_reader_open (struct file_handle *handle, struct dictionary **dict)
return make_any_reader (SCRATCH_FILE,
scratch_reader_open (handle, dict));
}
return make_any_reader (SCRATCH_FILE,
scratch_reader_open (handle, dict));
}
-
abort
();
+
NOT_REACHED
();
}
/* Reads a single case from READER into C.
}
/* Reads a single case from READER into C.
@@
-158,7
+158,7
@@
any_reader_read (struct any_reader *reader, struct ccase *c)
case SCRATCH_FILE:
return scratch_reader_read_case (reader->private, c);
}
case SCRATCH_FILE:
return scratch_reader_read_case (reader->private, c);
}
-
abort
();
+
NOT_REACHED
();
}
/* Returns true if an I/O error has occurred on READER, false
}
/* Returns true if an I/O error has occurred on READER, false
@@
-177,7
+177,7
@@
any_reader_error (struct any_reader *reader)
case SCRATCH_FILE:
return scratch_reader_error (reader->private);
}
case SCRATCH_FILE:
return scratch_reader_error (reader->private);
}
-
abort
();
+
NOT_REACHED
();
}
/* Closes READER. */
}
/* Closes READER. */
@@
-202,6
+202,8
@@
any_reader_close (struct any_reader *reader)
break;
default:
break;
default:
-
abort
();
+
NOT_REACHED
();
}
}
+
+ free (reader);
}
}