projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug in frequencies.q which would crash on alpha values
[pspp]
/
src
/
dfm.c
diff --git
a/src/dfm.c
b/src/dfm.c
index 9e9d080c97f17440fb75d0b2d43bbfc7b0155fbe..b5023a82ef9caeeb0c6af468d6c90ea27ec9051d 100644
(file)
--- a/
src/dfm.c
+++ b/
src/dfm.c
@@
-17,25
+17,9
@@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/* AIX requires this to be the first thing in the file. */
#include <config.h>
#include <config.h>
-#if __GNUC__
-#define alloca __builtin_alloca
-#else
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
-#pragma alloca
-#else
-#ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#endif
-#endif
-#endif
-#endif
-
#include <assert.h>
#include <assert.h>
+#include "dfm.h"
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
@@
-50,8
+34,6
@@
char *alloca ();
#include "str.h"
#include "vfm.h"
#include "str.h"
#include "vfm.h"
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
#include "debug-print.h"
/* file_handle extension structure. */
#include "debug-print.h"
/* file_handle extension structure. */
@@
-108,9
+90,6
@@
open_inline_file (struct dfm_fhuser_ext *ext)
{
/* We want to indicate that the file is open, that we are not at
eof, and that another line needs to be read in. */
{
/* We want to indicate that the file is open, that we are not at
eof, and that another line needs to be read in. */
-#if __CHECKER__
- memset (&ext->file, 0, sizeof ext->file);
-#endif
ext->file.file = NULL;
ext->line = xmalloc (128);
#if !PRODUCTION
ext->file.file = NULL;
ext->line = xmalloc (128);
#if !PRODUCTION
@@
-490,6
+469,8
@@
eof:
char *
dfm_get_record (struct file_handle *h, int *len)
{
char *
dfm_get_record (struct file_handle *h, int *len)
{
+ assert (h != NULL);
+
if (h->class == NULL)
{
if (!open_file_r (h))
if (h->class == NULL)
{
if (!open_file_r (h))