[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
M4ERROR -> error
|
From: |
Akim Demaille |
|
Subject: |
M4ERROR -> error |
|
Date: |
19 Oct 2001 17:55:15 +0200 |
|
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Artificial Intelligence) |
This is what I'm thinking about (thanks Perl). BUt all these guys are
mainly error_at_line, so I'm not longer sure I want to go to error
now. It depends whether we still want to use error as an
error_at_line which hides m4_current_file/line or not.
Index: m4/debug.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/debug.c,v
retrieving revision 1.11
diff -u -u -r1.11 debug.c
--- m4/debug.c 2001/10/13 08:56:48 1.11
+++ m4/debug.c 2001/10/19 15:49:15
@@ -353,16 +353,16 @@
bp = m4_builtin_find_by_func (NULL, TOKEN_FUNC (argv[i]));
if (bp == NULL)
{
- M4ERROR ((warning_status, 0, "\
-INTERNAL ERROR: Builtin not found in builtin table! (m4_trace_pre ())"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Builtin not found in builtin table! (m4_trace_pre ())");
abort ();
}
m4_trace_format ("<%s>", bp->name);
break;
case M4_TOKEN_VOID:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad token data type (m4_trace_pre
())"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad token data type (m4_trace_pre ())");
abort ();
}
Index: m4/input.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/input.c,v
retrieving revision 1.20
diff -u -u -r1.20 input.c
--- m4/input.c 2001/10/19 09:44:09 1.20
+++ m4/input.c 2001/10/19 15:49:15
@@ -498,8 +498,8 @@
{
if (next != NULL)
{
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Recursive push_string!"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Recursive push_string!");
abort ();
}
@@ -602,8 +602,8 @@
{
if (isp->funcs->read_func != macro_read)
{
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad call to init_builtin_token ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad call to init_builtin_token ()");
abort ();
}
@@ -641,8 +641,8 @@
}
else
{
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Input stack botch in next_char ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Input stack botch in next_char ()");
abort ();
}
@@ -675,8 +675,8 @@
}
else
{
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Input stack botch in m4_peek_input ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Input stack botch in m4_peek_input ()");
abort ();
}
@@ -985,8 +985,8 @@
if ((code < 0) && (key != '\0'))
{
- M4ERROR ((warning_status, 0,
- _("Undefined syntax code %c"), key));
+ error (warning_status, 0,
+ _("Undefined syntax code %c"), key);
return;
}
Index: m4/macro.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/macro.c,v
retrieving revision 1.21
diff -u -u -r1.21 macro.c
--- m4/macro.c 2001/10/19 09:43:51 1.21
+++ m4/macro.c 2001/10/19 15:49:15
@@ -89,8 +89,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad token type in expand_token ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad token type in expand_token ()");
abort ();
}
@@ -169,8 +169,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad token type in expand_argument ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad token type in expand_argument ()");
abort ();
}
@@ -242,8 +242,8 @@
break;
case M4_TOKEN_VOID:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad symbol type in call_macro ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad symbol type in call_macro ()");
abort ();
}
}
@@ -269,9 +269,9 @@
m4_expansion_level++;
if (m4_expansion_level > nesting_limit)
- M4ERROR ((EXIT_FAILURE, 0, _("\
+ error (EXIT_FAILURE, 0, _("\
ERROR: Recursion limit of %d exceeded, use -L<N> to change it"),
- nesting_limit));
+ nesting_limit);
macro_call_id++;
my_call_id = macro_call_id;
Index: m4/module.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/module.c,v
retrieving revision 1.16
diff -u -u -r1.16 module.c
--- m4/module.c 2001/10/19 15:35:11 1.16
+++ m4/module.c 2001/10/19 15:49:15
@@ -174,8 +174,8 @@
module system has already been initialised. */
if (m4_caller_id)
{
- M4ERROR ((warning_status, 0,
- _("Warning: multiple module loader initialisations")));
+ error (warning_status, 0,
+ _("Warning: multiple module loader initialisations"));
return;
}
@@ -221,9 +221,9 @@
/* Couldn't initialise the module system; diagnose and exit. */
if (errors)
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("failed to initialise module loader: %s"),
- m4_module_dlerror ()));
+ m4_module_dlerror ());
#ifdef DEBUG_MODULES
M4_DEBUG_MESSAGE ("Module loader initialised.");
@@ -273,9 +273,9 @@
else
{
/* Couldn't open the module; diagnose and exit. */
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("cannot open module `%s': %s"),
- name, m4_module_dlerror ()));
+ name, m4_module_dlerror ());
}
if (!bp && !mp && !init_func)
@@ -283,9 +283,9 @@
/* Since we don't use it here, only check for the finish hook
if we were about to diagnose a module with no entry points. */
if (!lt_dlsym (handle, M4_FINISH_SYMBOL))
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("module `%s' has no entry points"),
- name));
+ name);
}
/* If the module was correctly opened and has the necessary
@@ -309,9 +309,9 @@
{
xfree (stale);
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: overiding stale caller data in module
`%s'"),
- name));
+ name);
}
#ifdef DEBUG_MODULES
@@ -373,9 +373,9 @@
if (errors)
{
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("cannot close module `%s': %s"),
- name, m4_module_dlerror ()));
+ name, m4_module_dlerror ());
}
xfree (name);
@@ -401,9 +401,9 @@
if (lt_dlexit() != 0)
{
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("cannot close modules: %s"),
- m4_module_dlerror ()));
+ m4_module_dlerror ());
}
}
@@ -418,9 +418,9 @@
if (!info)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: cannot load module `%s': %s"),
- name, m4_module_dlerror ()));
+ name, m4_module_dlerror ());
}
else if (info->ref_count == 1)
{
@@ -516,9 +516,9 @@
if (errors)
{
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("cannot unload module `%s': %s"),
- name, m4_module_dlerror ()));
+ name, m4_module_dlerror ());
}
}
@@ -555,8 +555,8 @@
if (errors)
{
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("cannot unload all modules: %s"),
- m4_module_dlerror ()));
+ m4_module_dlerror ());
}
}
Index: m4/output.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/output.c,v
retrieving revision 1.10
diff -u -u -r1.10 output.c
--- m4/output.c 2001/10/19 15:35:11 1.10
+++ m4/output.c 2001/10/19 15:49:15
@@ -283,8 +283,8 @@
selected_diversion->file = tmpfile ();
if (selected_diversion->file == NULL)
- M4ERROR ((EXIT_FAILURE, errno,
- _("cannot create temporary file for diversion")));
+ error (EXIT_FAILURE, errno,
+ _("cannot create temporary file for diversion"));
if (selected_diversion->used > 0)
{
@@ -293,8 +293,8 @@
1,
selected_diversion->file);
if (count != 1)
- M4ERROR ((EXIT_FAILURE, errno,
- _("cannot flush diversion to temporary file")));
+ error (EXIT_FAILURE, errno,
+ _("cannot flush diversion to temporary file"));
}
/* Reclaim the buffer space for other diversions. */
@@ -372,7 +372,7 @@
{
count = fwrite (text, length, 1, output_file);
if (count != 1)
- M4ERROR ((EXIT_FAILURE, errno, _("copying inserted file")));
+ error (EXIT_FAILURE, errno, _("copying inserted file"));
}
else
{
@@ -575,7 +575,7 @@
while (length = read (fileno (file), buffer, COPY_BUFFER_SIZE),
length != 0)
if (length == (size_t) -1)
- M4ERROR ((EXIT_FAILURE, errno, _("reading inserted file")));
+ error (EXIT_FAILURE, errno, _("reading inserted file"));
else
output_text (buffer, length);
}
@@ -665,10 +665,10 @@
{
fflush (diversion->file);
if (fstat (fileno (diversion->file), &file_stat) < 0)
- M4ERROR ((EXIT_FAILURE, errno, _("cannot stat diversion")));
+ error (EXIT_FAILURE, errno, _("cannot stat diversion"));
if (file_stat.st_size < 0
|| file_stat.st_size != (unsigned long) file_stat.st_size)
- M4ERROR ((EXIT_FAILURE, errno, _("diversion too large")));
+ error (EXIT_FAILURE, errno, _("diversion too large"));
fprintf (file, "D%d,%lu", divnum,
(unsigned long) file_stat.st_size);
}
Index: modules/evalparse.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/evalparse.c,v
retrieving revision 1.6
diff -u -u -r1.6 evalparse.c
--- modules/evalparse.c 2001/10/13 08:55:43 1.6
+++ modules/evalparse.c 2001/10/19 15:49:16
@@ -518,8 +518,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad comparison operator in cmp_term ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad comparison operator in cmp_term ()");
abort ();
}
}
@@ -563,8 +563,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad shift operator in shift_term ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad shift operator in shift_term ()");
abort ();
}
}
@@ -665,8 +665,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad operator in mult_term ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad operator in mult_term ()");
abort ();
}
}
@@ -783,9 +783,9 @@
if (radix <= 1 || radix > 36)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: radix out of range: %d"),
- M4ARG(0), radix));
+ M4ARG(0), radix);
return;
}
@@ -794,9 +794,9 @@
if (min <= 0)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: negative width: %d"),
- M4ARG(0), min));
+ M4ARG(0), min);
return;
}
@@ -816,44 +816,44 @@
break;
case MISSING_RIGHT:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: missing right parenthesis: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
case SYNTAX_ERROR:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: bad expression: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
case UNKNOWN_INPUT:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: bad input: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
case EXCESS_INPUT:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: excess input: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
case DIVIDE_ZERO:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: divide by zero: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
case MODULO_ZERO:
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: %s: modulo by zero: %s"),
- M4ARG (0), M4ARG (1)));
+ M4ARG (0), M4ARG (1));
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad error code in evaluate ()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad error code in evaluate ()");
abort ();
}
Index: modules/gnu.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/gnu.c,v
retrieving revision 1.19
diff -u -u -r1.19 gnu.c
--- modules/gnu.c 2001/10/13 08:54:53 1.19
+++ modules/gnu.c 2001/10/19 15:49:16
@@ -140,8 +140,8 @@
bp = m4_builtin_find_by_name (NULL, name);
if (bp == NULL)
- M4ERROR ((warning_status, 0,
- _("Undefined name %s"), name));
+ error (warning_status, 0,
+ _("Undefined name %s"), name);
else
(*bp->func) (obs, argc - 1, argv + 1);
}
@@ -162,8 +162,8 @@
symbol = m4_symbol_lookup (name);
if (symbol == NULL)
- M4ERROR ((warning_status, 0,
- _("Undefined name `%s'"), name));
+ error (warning_status, 0,
+ _("Undefined name `%s'"), name);
else
m4_call_macro (symbol, argc - 1, argv + 1, obs);
}
@@ -216,8 +216,8 @@
}
if (new_debug_level < 0)
- M4ERROR ((warning_status, 0,
- _("Debugmode: bad debug flags: `%s'"), M4ARG (1)));
+ error (warning_status, 0,
+ _("Debugmode: bad debug flags: `%s'"), M4ARG (1));
else
{
switch (change_flag)
@@ -249,8 +249,8 @@
if (argc == 1)
m4_debug_set_output (NULL);
else if (!m4_debug_set_output (M4ARG (1)))
- M4ERROR ((warning_status, errno,
- _("Cannot set error file: %s"), M4ARG (1)));
+ error (warning_status, errno,
+ _("Cannot set error file: %s"), M4ARG (1));
}
@@ -279,9 +279,9 @@
if (msg != NULL)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("%s: bad regular expression `%s': %s"),
- caller, regexp, msg));
+ caller, regexp, msg);
return NULL;
}
@@ -321,9 +321,9 @@
if (startpos == -2)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("%s: error matching regular expression `%s'"),
- M4ARG (0), regexp));
+ M4ARG (0), regexp);
return;
}
@@ -397,9 +397,9 @@
copied verbatim. */
if (matchpos == -2)
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("%s: error matching regular expression `%s'"),
- M4ARG (0), regexp));
+ M4ARG (0), regexp);
else if (offset < length)
obstack_grow (obs, victim + offset, length - offset);
break;
@@ -504,8 +504,8 @@
pin = popen (M4ARG (1), "r");
if (pin == NULL)
{
- M4ERROR ((warning_status, errno,
- _("Cannot open pipe to command `%s'"), M4ARG (1)));
+ error (warning_status, errno,
+ _("Cannot open pipe to command `%s'"), M4ARG (1));
m4_sysval = 0xff << 8;
}
else
@@ -573,8 +573,8 @@
case '0':
if (!substitute_warned)
{
- M4ERROR ((warning_status, 0, _("\
-WARNING: \\0 will disappear, use \\& instead in replacements")));
+ error (warning_status, 0, _("\
+WARNING: \\0 will disappear, use \\& instead in replacements"));
substitute_warned = 1;
}
/* Fall through. */
Index: modules/load.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/load.c,v
retrieving revision 1.8
diff -u -u -r1.8 load.c
--- modules/load.c 2001/10/12 19:57:29 1.8
+++ modules/load.c 2001/10/19 15:49:16
@@ -74,9 +74,9 @@
if (handle)
if (lt_dlmakeresident (handle) != 0)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: cannot make module `%s' resident: %s"),
- m4_module_name (handle), lt_dlerror ()));
+ m4_module_name (handle), lt_dlerror ());
}
}
Index: modules/m4.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/m4.c,v
retrieving revision 1.32
diff -u -u -r1.32 m4.c
--- modules/m4.c 2001/10/18 21:27:36 1.32
+++ modules/m4.c 2001/10/19 15:49:16
@@ -128,9 +128,9 @@
if (handle)
if (lt_dlmakeresident (handle) != 0)
{
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("Warning: cannot make module `%s' resident: %s"),
- m4_module_name (handle), lt_dlerror ()));
+ m4_module_name (handle), lt_dlerror ());
}
}
@@ -452,8 +452,8 @@
fclose (fp);
}
else
- M4ERROR ((warning_status, errno,
- _("Cannot undivert %s"), M4ARG (1)));
+ error (warning_status, errno,
+ _("Cannot undivert %s"), M4ARG (1));
}
}
}
@@ -511,8 +511,8 @@
if (fp == NULL)
{
if (!silent)
- M4ERROR ((warning_status, errno,
- _("Cannot open %s"), M4ARG (1)));
+ error (warning_status, errno,
+ _("Cannot open %s"), M4ARG (1));
return;
}
Index: modules/mpeval.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/mpeval.c,v
retrieving revision 1.11
diff -u -u -r1.11 mpeval.c
--- modules/mpeval.c 2001/10/12 19:57:29 1.11
+++ modules/mpeval.c 2001/10/19 15:49:16
@@ -185,8 +185,8 @@
{
if (noisily && mpz_cmp_si (mpq_denref (q), (long) 1) != 0)
{
- M4ERROR ((warning_status, 0,
- _("Loss of precision in eval: %s"), noisily));
+ error (warning_status, 0,
+ _("Loss of precision in eval: %s"), noisily);
}
mpz_div (z, mpq_numref (q), mpq_denref (q));
Index: src/freeze.c
===================================================================
RCS file: /cvsroot/m4/m4/src/freeze.c,v
retrieving revision 1.22
diff -u -u -r1.22 freeze.c
--- src/freeze.c 2001/10/13 08:56:48 1.22
+++ src/freeze.c 2001/10/19 15:49:16
@@ -158,8 +158,8 @@
if (bp == NULL)
{
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Builtin not found in builtin table!"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Builtin not found in builtin table!");
abort ();
}
@@ -180,8 +180,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad token data type in produce_symbol_dump
()"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad token data type in produce_symbol_dump
()");
abort ();
break;
}
@@ -195,7 +195,7 @@
if (file = fopen (name, "w"), !file)
{
- M4ERROR ((warning_status, errno, name));
+ error (warning_status, errno, name);
return;
}
@@ -271,10 +271,10 @@
issue_expect_message (int expected)
{
if (expected == '\n')
- M4ERROR ((EXIT_FAILURE, 0, _("Expecting line feed in frozen file")));
+ error (EXIT_FAILURE, 0, _("Expecting line feed in frozen file"));
else
- M4ERROR ((EXIT_FAILURE, 0, _("Expecting character `%c' in frozen file"),
- expected));
+ error (EXIT_FAILURE, 0, _("Expecting character `%c' in frozen file"),
+ expected);
}
/* Reload a frozen state from the given file NAME. */
@@ -354,8 +354,8 @@
CHECK_ALLOCATION((Buf), (BufSize), (StrLen)); \
if ((StrLen) > 0) \
if (!fread ((Buf), (size_t) (StrLen), 1, (File))) \
- M4ERROR ((EXIT_FAILURE, 0, \
- _("Premature end of frozen file"))); \
+ error (EXIT_FAILURE, 0, \
+ _("Premature end of frozen file")); \
(Buf)[(StrLen)] = '\0'; \
} \
while (0)
@@ -382,7 +382,7 @@
file = m4_path_search (name, (char **)NULL);
if (file == NULL)
- M4ERROR ((EXIT_FAILURE, errno, _("Cannot open %s"), name));
+ error (EXIT_FAILURE, errno, _("Cannot open %s"), name);
allocated[0] = 100;
string[0] = xmalloc ((size_t) allocated[0]);
@@ -395,7 +395,7 @@
switch (character)
{
default:
- M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+ error (EXIT_FAILURE, 0, _("Ill-formated frozen file"));
case '\n':
@@ -437,7 +437,7 @@
else
{
/* 3 argument 'F' operations are invalid for format version 1. */
- M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+ error (EXIT_FAILURE, 0, _("Ill-formated frozen file"));
}
VALIDATE ('\n');
@@ -484,9 +484,9 @@
bp->min_args, bp->max_args);
}
else
- M4ERROR ((warning_status, 0,
+ error (warning_status, 0,
_("`%s' from frozen file not found in builtin table!"),
- string[0]));
+ string[0]);
}
break;
@@ -500,7 +500,7 @@
if (version < 2)
{
/* 'M' operator is not supported in format version 1. */
- M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+ error (EXIT_FAILURE, 0, _("Ill-formated frozen file"));
}
GET_CHARACTER;
@@ -518,7 +518,7 @@
if (version < 2)
{
/* 'S' operator is not supported in format version 1. */
- M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+ error (EXIT_FAILURE, 0, _("Ill-formated frozen file"));
}
GET_CHARACTER;
@@ -537,8 +537,8 @@
int ch = decode_char (file);
if (ch < 0)
- M4ERROR ((EXIT_FAILURE, 0,
- _("Premature end of frozen file")));
+ error (EXIT_FAILURE, 0,
+ _("Premature end of frozen file"));
string[0][i] = (unsigned char) ch;
}
@@ -636,7 +636,7 @@
else
{
/* 3 argument 'T' operations are invalid for format version 1. */
- M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+ error (EXIT_FAILURE, 0, _("Ill-formated frozen file"));
}
VALIDATE ('\n');
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.32
diff -u -u -r1.32 main.c
--- src/main.c 2001/10/19 15:35:11 1.32
+++ src/main.c 2001/10/19 15:49:16
@@ -70,8 +70,8 @@
static void
stackovf_handler (void)
{
- M4ERROR ((EXIT_FAILURE, 0,
- _("Stack overflow. (Infinite define recursion?)")));
+ error (EXIT_FAILURE, 0,
+ _("Stack overflow. (Infinite define recursion?)"));
}
#endif /* USE_STACKOV */
@@ -303,13 +303,13 @@
{
const char *dlerr = lt_dlerror();
if (dlerr == NULL)
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("failed to add search directory `%s'"),
- optarg));
+ optarg);
else
- M4ERROR ((EXIT_FAILURE, 0,
+ error (EXIT_FAILURE, 0,
_("failed to add search directory `%s': %s"),
- optarg, dlerr));
+ optarg, dlerr);
}
break;
@@ -452,8 +452,8 @@
break;
default:
- M4ERROR ((warning_status, 0,
- "INTERNAL ERROR: Bad code in deferred arguments"));
+ error (warning_status, 0,
+ "INTERNAL ERROR: Bad code in deferred arguments");
abort ();
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- M4ERROR -> error,
Akim Demaille <=