projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up pref.h.orig and deal with the consequences.
[pspp]
/
src
/
data-list.c
diff --git
a/src/data-list.c
b/src/data-list.c
index a024b263815c5cf39a14959c891cb2360c6dd605..1a6b9af89f0699417055f34ce65bc7518e170792 100644
(file)
--- a/
src/data-list.c
+++ b/
src/data-list.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 <ctype.h>
#include <float.h>
#include <assert.h>
#include <ctype.h>
#include <float.h>
@@
-1216,7
+1199,7
@@
destroy_dls (struct trns_header *pgm)
/* Note that since this is exclusively an input program, C is
guaranteed to be temp_case. */
static int
/* Note that since this is exclusively an input program, C is
guaranteed to be temp_case. */
static int
-read_one_case (struct trns_header *t, struct ccase *c
unused
)
+read_one_case (struct trns_header *t, struct ccase *c
UNUSED
)
{
dlsp = (struct data_list_pgm *) t;
return do_reading (1);
{
dlsp = (struct data_list_pgm *) t;
return do_reading (1);
@@
-1335,7
+1318,7
@@
cmd_repeating_data (void)
lex_match ('=');
if (seen & 1)
{
lex_match ('=');
if (seen & 1)
{
- msg (SE, _("
STARTS subcommand given multiple times.")
);
+ msg (SE, _("
%s subcommand given multiple times."),"STARTS"
);
return CMD_FAILURE;
}
seen |= 1;
return CMD_FAILURE;
}
seen |= 1;
@@
-1370,7
+1353,7
@@
cmd_repeating_data (void)
lex_match ('=');
if (seen & 2)
{
lex_match ('=');
if (seen & 2)
{
- msg (SE, _("
OCCURS subcommand given multiple times.")
);
+ msg (SE, _("
%s subcommand given multiple times."),"OCCURS"
);
return CMD_FAILURE;
}
seen |= 2;
return CMD_FAILURE;
}
seen |= 2;
@@
-1383,7
+1366,7
@@
cmd_repeating_data (void)
lex_match ('=');
if (seen & 4)
{
lex_match ('=');
if (seen & 4)
{
- msg (SE, _("
LENGTH subcommand given multiple times.")
);
+ msg (SE, _("
%s subcommand given multiple times."),"LENGTH"
);
return CMD_FAILURE;
}
seen |= 4;
return CMD_FAILURE;
}
seen |= 4;
@@
-1396,7
+1379,7
@@
cmd_repeating_data (void)
lex_match ('=');
if (seen & 8)
{
lex_match ('=');
if (seen & 8)
{
- msg (SE, _("
CONTINUED subcommand given multiple times.")
);
+ msg (SE, _("
%s subcommand given multiple times."),"CONTINUED"
);
return CMD_FAILURE;
}
seen |= 8;
return CMD_FAILURE;
}
seen |= 8;
@@
-1429,7
+1412,7
@@
cmd_repeating_data (void)
lex_match ('=');
if (seen & 16)
{
lex_match ('=');
if (seen & 16)
{
- msg (SE, _("
ID subcommand given multiple times.")
);
+ msg (SE, _("
%s subcommand given multiple times."),"ID"
);
return CMD_FAILURE;
}
seen |= 16;
return CMD_FAILURE;
}
seen |= 16;
@@
-1782,7
+1765,7
@@
rpd_parse_record (int beg, int end, int ofs, struct ccase *c,
warned = 1;
tmsg (SW, RPD_ERR,
warned = 1;
tmsg (SW, RPD_ERR,
- _("Variable %s start
g
ing in column %d extends "
+ _("Variable %s starting in column %d extends "
"beyond physical record length of %d."),
var_spec->v->name, fc, len);
}
"beyond physical record length of %d."),
var_spec->v->name, fc, len);
}