a few updates from texlive

source/texk/web2c/mplibdir/ChangeLog

+2010-04-05  Karl Berry  <karl@tug.org>
+
+	* mptrap.test: use --mem, not --memname (which does not exist).
+
 2010-04-01  Taco Hoekwater <taco@elvenkind.com>
 	    
 	* lmplib.c: revert #include "../luatex-api.h".

source/texk/web2c/mplibdir/mptrap.test

@@ -42,7 +42,8 @@ mv trap.log mptrapin.log || exit 1
 diff $testdir/mptrapin.log mptrapin.log
 
 # Must run inimpost or font_name[null_font] is not initialized, leading to diffs.
-./mpost --progname=inimpost --jobname=trap --memname=trap <$testdir/mptrap2.in >mptrap.fot
+./mpost --progname=inimpost --jobname=trap --mem=trap \
+  <$testdir/mptrap2.in >mptrap.fot
 
 ## Here the test fails, but we just exit or 'make distcheck' would fail
 

source/texk/web2c/tiedir/ChangeLog

+2010-04-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tie-w2c.ch: Replace "-[m|c]" in usage message by "-m|-c".
+
+2009-08-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid maximal compiler warnings.
+	* tie-w2c.ch (Print the job history): Constify local sting.
+
+2009-08-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ../am/cweb.am (tie_CFLAGS): Enable compiler warnings.
+	(tie_CPPFLAGS): Use -DNOT_WEB2C, not to import from
+	../lib/lib.h globals defined in ../lib/main.c.
+	* tie-w2c.ch: Declare all functions (except main) as static.
+	(Print the job history): Silence uninitialized warning.
+
 2009-06-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tie-w2c.ch: drop P?C, P?H, use ANSI C function declarations.

source/texk/web2c/tiedir/tie-w2c.ch

@@ -42,14 +42,16 @@ typedef char* string;
 void get_line(i)
 	file_index i;
 @y
-void get_line (file_index i)
+static void
+get_line (file_index i)
 @z
 
 @x
 void err_loc(i) /* prints location of error */
         int i;
 @y
-void err_loc (int i) /* prints location of error */
+static void
+err_loc (int i) /* prints location of error */
 @z
 
 @x
@@ -68,41 +70,51 @@ void err_loc (int i) /* prints location of error */
 boolean lines_dont_match(i,j)
 	file_index i,j;
 @y
-boolean lines_dont_match (file_index i, file_index j)
+static boolean
+lines_dont_match (file_index i, file_index j)
 @z
 
 @x
 void init_change_file(i,b)
 	file_index i; boolean b;
 @y
-void init_change_file (file_index i, boolean b)
+static void
+init_change_file (file_index i, boolean b)
 @z
 
 @x
 void put_line(j)
 	file_index j;
 @y
-void put_line (file_index j)
+static void
+put_line (file_index j)
 @z
 
 @x
 boolean e_of_ch_module(i)
 	file_index i;
 @y
-boolean e_of_ch_module (file_index i)
+static boolean
+e_of_ch_module (file_index i)
 @z
 
 @x
 boolean e_of_ch_preamble(i)
 	file_index i;
 @y
-boolean e_of_ch_preamble (file_index i)
+static boolean
+e_of_ch_preamble (file_index i)
 @z
 
 @x
 void usage()
+{
+   print("Usage: tie -[mc] outfile master changefile(s)");
 @y
+static
 void usage (void)
+{
+   print("Usage: tie -m|-c outfile master changefile(s)");
 @z
 
 @x
@@ -121,3 +133,16 @@ int main (int argc, string *argv)
   print_ln(versionstring);  /* Web2C version */
   print_ln(copyright); /* include the copyright notice */
 @z
+
+@x
+{string msg;
+@y
+{const_string msg;
+@z
+
+@x -- silence unitialized warning
+      case fatal: msg="That was a fatal error, my friend";  break;
+@y
+      default: /* Anything except spotless, troublesome, or fatal is a bug. */
+      case fatal: msg="That was a fatal error, my friend";  break;
+@z
\ No newline at end of file