improved layout with varargs

This commit is contained in:
ceriel 1988-04-25 16:24:42 +00:00
parent 71dd29ae30
commit d260937564
2 changed files with 69 additions and 34 deletions

View file

@ -55,7 +55,9 @@ error(va_alist)
va_list ap;
va_start(ap);
_error(ERROR, NILEXPR, ap);
{
_error(ERROR, NILEXPR, ap);
}
va_end(ap);
}
@ -63,15 +65,17 @@ error(va_alist)
expr_error(va_alist)
va_dcl
{
struct expr *expr;
va_list ap;
va_start(ap);
expr = va_arg(ap, struct expr *);
if (!(expr->ex_flags & EX_ERROR)) {
/* to prevent proliferation */
_error(ERROR, expr, ap);
expr->ex_flags |= EX_ERROR;
{
register struct expr *expr = va_arg(ap, struct expr *);
if (!(expr->ex_flags & EX_ERROR)) {
/* to prevent proliferation */
_error(ERROR, expr, ap);
expr->ex_flags |= EX_ERROR;
}
}
va_end(ap);
}
@ -83,7 +87,9 @@ warning(va_alist)
va_list ap;
va_start(ap);
_error(WARNING, NILEXPR, ap);
{
_error(WARNING, NILEXPR, ap);
}
va_end(ap);
}
@ -91,14 +97,16 @@ warning(va_alist)
expr_warning(va_alist)
va_dcl
{
struct expr *expr;
va_list ap;
va_start(ap);
expr = va_arg(ap, struct expr *);
if (!(expr->ex_flags & EX_ERROR)) {
/* to prevent proliferation */
_error(WARNING, expr, ap);
{
struct expr *expr = va_arg(ap, struct expr *);
if (!(expr->ex_flags & EX_ERROR)) {
/* to prevent proliferation */
_error(WARNING, expr, ap);
}
}
va_end(ap);
}
@ -110,7 +118,9 @@ lexerror(va_alist)
va_list ap;
va_start(ap);
_error(LEXERROR, NILEXPR, ap);
{
_error(LEXERROR, NILEXPR, ap);
}
va_end(ap);
}
@ -122,7 +132,9 @@ lexwarning(va_alist)
va_list ap;
va_start(ap);
_error(LEXWARNING, NILEXPR, ap);
{
_error(LEXWARNING, NILEXPR, ap);
}
va_end(ap);
}
#endif NOPP
@ -134,8 +146,11 @@ crash(va_alist)
va_list ap;
va_start(ap);
_error(CRASH, NILEXPR, ap);
{
_error(CRASH, NILEXPR, ap);
}
va_end(ap);
C_close();
#ifdef DEBUG
sys_stop(S_ABORT);
@ -151,9 +166,12 @@ fatal(va_alist)
va_list ap;
va_start(ap);
if (C_busy()) C_close();
_error(FATAL, NILEXPR, ap);
{
_error(FATAL, NILEXPR, ap);
}
va_end(ap);
if (C_busy()) C_close();
sys_stop(S_EXIT);
}

View file

@ -68,7 +68,9 @@ debug(va_alist)
va_list ap;
va_start(ap);
_error(VDEBUG, NULLNODE, ap);
{
_error(VDEBUG, NULLNODE, ap);
}
va_end(ap);
}
#endif DEBUG
@ -80,7 +82,9 @@ error(va_alist)
va_list ap;
va_start(ap);
_error(ERROR, NULLNODE, ap);
{
_error(ERROR, NULLNODE, ap);
}
va_end(ap);
}
@ -88,12 +92,14 @@ error(va_alist)
node_error(va_alist)
va_dcl
{
t_node *node;
va_list ap;
va_start(ap);
node = va_arg(ap, t_node *);
_error(ERROR, node, ap);
{
t_node *node = va_arg(ap, t_node *);
_error(ERROR, node, ap);
}
va_end(ap);
}
@ -104,8 +110,10 @@ warning(va_alist)
va_list ap;
va_start(ap);
warn_class = va_arg(ap, int);
_error(WARNING, NULLNODE, ap);
{
warn_class = va_arg(ap, int);
_error(WARNING, NULLNODE, ap);
}
va_end(ap);
}
@ -113,13 +121,14 @@ warning(va_alist)
node_warning(va_alist)
va_dcl
{
t_node *nd;
va_list ap;
va_start(ap);
nd = va_arg(ap, t_node *);
warn_class = va_arg(ap, int);
_error(WARNING, nd, ap);
{
t_node *nd = va_arg(ap, t_node *);
warn_class = va_arg(ap, int);
_error(WARNING, nd, ap);
}
va_end(ap);
}
@ -130,7 +139,9 @@ lexerror(va_alist)
va_list ap;
va_start(ap);
_error(LEXERROR, NULLNODE, ap);
{
_error(LEXERROR, NULLNODE, ap);
}
va_end(ap);
}
@ -141,8 +152,10 @@ lexwarning(va_alist)
va_list ap;
va_start(ap);
warn_class = va_arg(ap, int);
_error(LEXWARNING, NULLNODE, ap);
{
warn_class = va_arg(ap, int);
_error(LEXWARNING, NULLNODE, ap);
}
va_end(ap);
}
@ -153,7 +166,9 @@ fatal(va_alist)
va_list ap;
va_start(ap);
_error(FATAL, NULLNODE, ap);
{
_error(FATAL, NULLNODE, ap);
}
va_end(ap);
sys_stop(S_EXIT);
}
@ -165,7 +180,9 @@ crash(va_alist)
va_list ap;
va_start(ap);
_error(CRASH, NULLNODE, ap);
{
_error(CRASH, NULLNODE, ap);
}
va_end(ap);
#ifdef DEBUG
sys_stop(S_ABORT);