[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/modules/m4.c,v
From: |
Eric Blake |
Subject: |
Changes to m4/modules/m4.c,v |
Date: |
Wed, 09 Aug 2006 21:33:27 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 06/08/09 21:33:24
Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- modules/m4.c 28 Jul 2006 14:06:11 -0000 1.63
+++ modules/m4.c 9 Aug 2006 21:33:24 -0000 1.64
@@ -146,12 +146,10 @@
progress. */
M4INIT_HANDLER (m4)
{
- if (handle)
- if (lt_dlmakeresident (handle) != 0)
+ if (handle && lt_dlmakeresident (handle) != 0)
{
- M4ERROR ((m4_get_warning_status_opt (context), 0,
- _("Warning: cannot make module `%s' resident: %s"),
- m4_get_module_name (handle), lt_dlerror ()));
+ m4_error (context, 0, 0, _("cannot make module `%s' resident: %s"),
+ m4_get_module_name (handle), lt_dlerror ());
}
}
@@ -188,8 +186,8 @@
M4BUILTIN_HANDLER (undefine)
{
if (!m4_symbol_lookup (M4SYMTAB, M4ARG (1)))
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"), M4ARG (0), M4ARG (1)));
+ m4_warn (context, 0,_("Warning: %s: undefined name: %s"), M4ARG (0),
+ M4ARG (1));
else
m4_symbol_delete (M4SYMTAB, M4ARG (1));
}
@@ -212,8 +210,8 @@
M4BUILTIN_HANDLER (popdef)
{
if (!m4_symbol_lookup (M4SYMTAB, M4ARG (1)))
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"), M4ARG (0), M4ARG (1)));
+ m4_warn (context, 0, _("Warning: %s: undefined name: %s"), M4ARG (0),
+ M4ARG (1));
else
m4_symbol_popdef (M4SYMTAB, M4ARG (1));
}
@@ -341,9 +339,8 @@
dump_symbol_CB (NULL, M4ARG (i), symbol, data);
}
else if (complain)
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"),
- M4ARG (0), M4ARG (i)));
+ m4_warn (context, 0, _("Warning: %s: undefined name: %s"),
+ M4ARG (0), M4ARG (i));
}
}
@@ -410,17 +407,16 @@
m4_symbol *symbol = m4_symbol_lookup (M4SYMTAB, name);
if (!symbol)
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"),
- m4_get_symbol_value_text (argv[0]), name));
+ m4_warn (context, 0, _("Warning: %s: undefined name: %s"), M4ARG (0),
+ name);
else if (m4_is_symbol_text (symbol))
m4_shipout_string (context, obs, m4_get_symbol_text (symbol), 0, true);
else if (m4_is_symbol_func (symbol))
m4_push_builtin (m4_get_symbol_value (symbol));
else if (m4_is_symbol_placeholder (symbol))
- M4WARN ((m4_get_warning_status_opt (context), 0, _("\
+ m4_warn (context, 0, _("\
Warning: %s: builtin `%s' requested by frozen file not found"),
- name, m4_get_symbol_placeholder (symbol)));
+ name, m4_get_symbol_placeholder (symbol));
else
assert (!"Bad token data type in m4_defn");
}
@@ -518,11 +514,11 @@
int i = 0;
if (argc == 1)
- m4_undivert_all ();
+ m4_undivert_all (context);
else
{
if (sscanf (M4ARG (1), "%d", &i) == 1)
- m4_insert_diversion (i);
+ m4_insert_diversion (context, i);
else if (m4_get_posixly_correct_opt (context))
m4_numeric_arg (context, argc, argv, 1, &i);
else
@@ -530,12 +526,12 @@
FILE *fp = m4_path_search (context, M4ARG (1), (char **) NULL);
if (fp != NULL)
{
- m4_insert_file (fp);
+ m4_insert_file (context, fp);
fclose (fp);
}
else
- M4ERROR ((m4_get_warning_status_opt (context), errno,
- _("Cannot undivert %s"), M4ARG (1)));
+ m4_error (context, 0, errno, _("%s: cannot undivert `%s'"),
+ M4ARG (0), M4ARG (1));
}
}
}
@@ -594,8 +590,8 @@
if (fp == NULL)
{
if (!silent)
- M4ERROR ((m4_get_warning_status_opt (context), errno,
- _("Cannot open %s"), M4ARG (1)));
+ m4_error (context, 0, errno, _("%s: cannot open `%s'"), M4ARG (0),
+ M4ARG (1));
return;
}
@@ -626,11 +622,11 @@
errno = 0;
if ((fd = mkstemp (M4ARG(1))) < 0)
{
- M4ERROR ((m4_get_warning_status_opt (context), errno,
- "Cannot create tempfile %s", M4ARG (1)));
+ m4_error (context, 0, errno, _("%s: cannot create tempfile `%s'"),
+ M4ARG (0), M4ARG (1));
return;
}
- close(fd);
+ close (fd);
m4_shipout_string (context, obs, M4ARG (1), 0, false);
}
@@ -705,8 +701,8 @@
if (symbol != NULL)
set_trace_CB (NULL, NULL, symbol, (char *) obs);
else
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"), M4ARG (0), name));
+ m4_warn (context, 0, _("Warning: %s: undefined name: %s"),
+ M4ARG (0), name);
}
}
@@ -725,8 +721,8 @@
if (symbol != NULL)
set_trace_CB (NULL, NULL, symbol, NULL);
else
- M4WARN ((m4_get_warning_status_opt (context), 0,
- _("Warning: %s: undefined name: %s"), M4ARG (0), name));
+ m4_warn (context, 0, _("Warning: %s: undefined name: %s"),
+ M4ARG (0), name);
}
}
- Changes to m4/modules/m4.c,v,
Eric Blake <=
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/08/21
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/08/25
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/08/30
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/08/30