projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of "struct long_vec", envector(), devector(), etc.
[pspp-builds.git]
/
src
/
print.c
diff --git
a/src/print.c
b/src/print.c
index 3f556707cdbb40a8619363db6f8903230de37d8b..7d5b73b8cc75a81fc38916b761d142d40737c16a 100644
(file)
--- a/
src/print.c
+++ b/
src/print.c
@@
-17,24
+17,7
@@
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 <stdlib.h>
#include "alloc.h"
#include <assert.h>
#include <stdlib.h>
#include "alloc.h"
@@
-97,9
+80,7
@@
struct print_trns
int options; /* PRT_* bitmapped field. */
struct prt_out_spec *spec; /* Output specifications. */
int max_width; /* Maximum line width including null. */
int options; /* PRT_* bitmapped field. */
struct prt_out_spec *spec; /* Output specifications. */
int max_width; /* Maximum line width including null. */
-#if !PAGED_STACK
char *line; /* Buffer for sticking lines in. */
char *line; /* Buffer for sticking lines in. */
-#endif
};
/* PRT_PRINT or PRT_WRITE. */
};
/* PRT_PRINT or PRT_WRITE. */
@@
-169,9
+150,7
@@
internal_cmd_print (int f)
prt.handle = NULL;
prt.options = f;
prt.spec = NULL;
prt.handle = NULL;
prt.options = f;
prt.spec = NULL;
-#if !PAGED_STACK
prt.line = NULL;
prt.line = NULL;
-#endif
next = NULL;
nrec = 0;
next = NULL;
nrec = 0;
@@
-453,7
+432,7
@@
fail:
static int
parse_variable_argument (void)
{
static int
parse_variable_argument (void)
{
- if (!parse_variables (
NULL
, &fx.v, &fx.nv, PV_DUPLICATE))
+ if (!parse_variables (
default_dict
, &fx.v, &fx.nv, PV_DUPLICATE))
return 0;
if (token == T_NUM)
return 0;
if (token == T_NUM)
@@
-870,15
+849,14
@@
dump_table (void)
}
/* PORTME: The number of characters in a line terminator. */
}
/* PORTME: The number of characters in a line terminator. */
-#if __MSDOS__
+#if
def
__MSDOS__
#define LINE_END_WIDTH 2 /* \r\n */
#else
#define LINE_END_WIDTH 1 /* \n */
#endif
/* Calculates the maximum possible line width and allocates a buffer
#define LINE_END_WIDTH 2 /* \r\n */
#else
#define LINE_END_WIDTH 1 /* \n */
#endif
/* Calculates the maximum possible line width and allocates a buffer
- big enough to contain it, if necessary (otherwise sets max_width).
- (The action taken depends on compiler & OS as detected by pref.h.) */
+ big enough to contain it */
static void
alloc_line (void)
{
static void
alloc_line (void)
{
@@
-915,9
+893,7
@@
alloc_line (void)
w = pot_w;
}
prt.max_width = w + LINE_END_WIDTH + 1;
w = pot_w;
}
prt.max_width = w + LINE_END_WIDTH + 1;
-#if !PAGED_STACK
prt.line = xmalloc (prt.max_width);
prt.line = xmalloc (prt.max_width);
-#endif
}
\f
/* Transformation. */
}
\f
/* Transformation. */
@@
-933,15
+909,7
@@
print_trns_proc (struct trns_header * trns, struct ccase * c)
struct prt_out_spec *i;
/* Line buffer. */
struct prt_out_spec *i;
/* Line buffer. */
-#if PAGED_STACK
-#if __GNUC__ && !__STRICT_ANSI__
- char buf[t->max_width];
-#else /* !__GNUC__ */
- char *buf = alloca (t->max_width);
-#endif /* !__GNUC__ */
-#else /* !PAGED_STACK */
char *buf = t->line;
char *buf = t->line;
-#endif /* !PAGED_STACK */
/* Length of the line in buf. */
int len = 0;
/* Length of the line in buf. */
int len = 0;
@@
-969,7
+937,7
@@
print_trns_proc (struct trns_header * trns, struct ccase * c)
|| t->handle->mode != FH_MD_BINARY)
{
/* PORTME: Line ends. */
|| t->handle->mode != FH_MD_BINARY)
{
/* PORTME: Line ends. */
-#if __MSDOS__
+#if
def
__MSDOS__
buf[len++] = '\r';
#endif
buf[len++] = '\n';
buf[len++] = '\r';
#endif
buf[len++] = '\n';
@@
-1039,9
+1007,7
@@
print_trns_free (struct trns_header * t)
n = i->next;
free (i);
}
n = i->next;
free (i);
}
-#if !PAGED_STACK
free (((struct print_trns *) t)->line);
free (((struct print_trns *) t)->line);
-#endif
}
\f
/* PRINT SPACE. */
}
\f
/* PRINT SPACE. */
@@
-1147,7
+1113,7
@@
print_space_trns_proc (struct trns_header * trns, struct ccase * c)
char buf[LINE_END_WIDTH];
/* PORTME: Line ends. */
char buf[LINE_END_WIDTH];
/* PORTME: Line ends. */
-#if __MSDOS__
+#if
def
__MSDOS__
buf[0] = '\r';
buf[1] = '\n';
#else
buf[0] = '\r';
buf[1] = '\n';
#else