shithub: sox

Download patch

ref: 54e1ee5ff9f8d8c52a806af59acd8f1060b14fe5
parent: c26ca4c28256e50776f9bd3115989da4345c7777
author: rrt <rrt>
date: Wed Apr 18 09:59:36 EDT 2007

Remove $Log tokens and associated log messages (in many files, several
copies of every log message were being written) and lots of warnings.

--- a/lpc10/analys.c
+++ b/lpc10/analys.c
@@ -1,50 +1,3 @@
-/*
-
-$Log: analys.c,v $
-Revision 1.1  2007/04/16 21:56:21  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
- * Revision 1.2  1996/08/20  20:16:01  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:29:08  jaf
- * Initial revision
- *
-
-*/
-
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: preemp_ 14 5 6 6 4 6 6 */
-/*:ref: onset_ 14 7 6 4 4 4 4 4 4 */
-/*:ref: placev_ 14 11 4 4 4 4 4 4 4 4 4 4 4 */
-/*:ref: lpfilt_ 14 4 6 6 4 4 */
-/*:ref: ivfilt_ 14 5 6 6 4 4 6 */
-/*:ref: tbdm_ 14 8 6 4 4 4 6 4 4 4 */
-/*:ref: voicin_ 14 12 4 6 6 4 4 6 6 4 6 4 4 4 */
-/*:ref: dyptrk_ 14 6 6 4 4 4 4 4 */
-/*:ref: placea_ 14 9 4 4 4 4 4 4 4 4 4 */
-/*:ref: dcbias_ 14 3 4 6 6 */
-/*:ref: energy_ 14 3 4 6 6 */
-/*:ref: mload_ 14 6 4 4 4 6 6 6 */
-/*:ref: invert_ 14 4 4 6 6 6 */
-/*:ref: rcchk_ 14 3 4 6 6 */
-/*:ref: initonset_ 14 0 */
-/*:ref: initvoicin_ 14 0 */
-/*:ref: initdyptrk_ 14 0 */
-/* Rerunning f2c -P may change prototypes or declarations. */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -52,6 +5,8 @@
 
 #include "f2c.h"
 
+int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -79,25 +34,6 @@
 
 /* 	ANALYS Version 55 */
 
-/* $Log: analys.c,v $
-/* Revision 1.1  2007/04/16 21:56:21  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:16:01  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:29:08  jaf
- * Initial revision
- * */
 /* Revision 1.9  1996/05/23  19:41:07  jaf */
 /* Commented out some unnecessary lines that were reading uninitialized */
 /* values. */
@@ -224,7 +160,7 @@
     extern /* Subroutine */ int onset_(real *, integer *, integer *, integer *
 	    , integer *, integer *, integer *, struct lpc10_encoder_state *);
     integer *osptr;
-    extern /* Subroutine */ placea_(integer *, integer *
+    extern int placea_(integer *, integer *
 	    , integer *, integer *, integer *, integer *, integer *, integer *
 	    , integer *), dcbias_(integer *, real *, real *), placev_(integer 
 	    *, integer *, integer *, integer *, integer *, integer *, integer 
@@ -247,68 +183,6 @@
 	    *, integer *, integer *, struct lpc10_encoder_state *);
     real phi[100]	/* was [10][10] */, psi[10];
 
-/* $Log: analys.c,v $
-/* Revision 1.1  2007/04/16 21:56:21  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:16:01  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:29:08  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
-/*   LPC Configuration parameters: */
-/* Frame size, Prediction order, Pitch period */
-/*       Arguments to ANALYS */
-/* $Log: analys.c,v $
-/* Revision 1.1  2007/04/16 21:56:21  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:16:01  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:29:08  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
-
 /*   LPC Processing control variables: */
 
 /* *** Read-only: initialized in setup */
@@ -480,10 +354,10 @@
     voibuf[0] = voibuf[2];
     voibuf[1] = voibuf[3];
     for (i__ = 1; i__ <= 2; ++i__) {
-	vwin[(i__ << 1) - 2] = vwin[(i__ + 1 << 1) - 2] - contrl_1.lframe;
-	vwin[(i__ << 1) - 1] = vwin[(i__ + 1 << 1) - 1] - contrl_1.lframe;
-	awin[(i__ << 1) - 2] = awin[(i__ + 1 << 1) - 2] - contrl_1.lframe;
-	awin[(i__ << 1) - 1] = awin[(i__ + 1 << 1) - 1] - contrl_1.lframe;
+	vwin[(i__ << 1) - 2] = vwin[((i__ + 1) << 1) - 2] - contrl_1.lframe;
+	vwin[(i__ << 1) - 1] = vwin[((i__ + 1) << 1) - 1] - contrl_1.lframe;
+	awin[(i__ << 1) - 2] = awin[((i__ + 1) << 1) - 2] - contrl_1.lframe;
+	awin[(i__ << 1) - 1] = awin[((i__ + 1) << 1) - 1] - contrl_1.lframe;
 /*       EWIN(*,J) is unused for J .NE. AF, so the following shift is 
 */
 /*       unnecessary.  It also causes error messages when the C versio
@@ -496,7 +370,7 @@
 /* 	   EWIN(2,I) = EWIN(2,I+1) - LFRAME */
 	obound[i__ - 1] = obound[i__];
 	voibuf[i__ * 2] = voibuf[(i__ + 1) * 2];
-	voibuf[(i__ << 1) + 1] = voibuf[(i__ + 1 << 1) + 1];
+	voibuf[(i__ << 1) + 1] = voibuf[((i__ + 1) << 1) + 1];
 	rmsbuf[i__ - 1] = rmsbuf[i__];
 	i__1 = contrl_1.order;
 	for (j = 1; j <= i__1; ++j) {
--- a/lpc10/bsynz.c
+++ b/lpc10/bsynz.c
@@ -1,13 +1,4 @@
 /*
-
-$Log: bsynz.c,v $
-Revision 1.1  2007/04/16 21:56:28  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -19,15 +10,8 @@
  * Revision 1.1  1996/08/19  22:32:58  jaf
  * Initial revision
  *
-
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: random_ 4 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,6 +19,8 @@
 
 #include "f2c.h"
 
+int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -48,14 +34,7 @@
 
 /* 	BSYNZ Version 54 */
 
-/* $Log: bsynz.c,v $
-/* Revision 1.1  2007/04/16 21:56:28  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -144,68 +123,6 @@
     extern integer random_(struct lpc10_decoder_state *);
     real xy, sum, ssq;
     real lpi0, hpi0;
-
-/* $Log: bsynz.c,v $
-/* Revision 1.1  2007/04/16 21:56:28  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:18:55  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:58  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
-/*   LPC Configuration parameters: */
-/* Frame size, Prediction order, Pitch period */
-/*       Arguments */
-/* $Log: bsynz.c,v $
-/* Revision 1.1  2007/04/16 21:56:28  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:18:55  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:58  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/chanwr.c
+++ b/lpc10/chanwr.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: chanwr.c,v $
-Revision 1.1  2007/04/16 21:56:30  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:20:24  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -19,11 +11,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st);
-extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -31,18 +18,14 @@
 
 #include "f2c.h"
 
+int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st);
+int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits);
+
 /* *********************************************************************** */
 
 /* 	CHANL Version 49 */
 
-/* $Log: chanwr.c,v $
-/* Revision 1.1  2007/04/16 21:56:30  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:20:24  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -123,7 +106,7 @@
 /* 	R5-1, R6-1, R7-2, R9-0,  P-5, */
 /* 	R5-2, R6-2,R10-1, R8-2,  P-6, R9-1, */
 /* 	R5-3, R6-3, R7-3, R9-2, R8-3, SYNC */
-/* Subroutine */ int chanwr_0_(int n__, integer *order, integer *ipitv, 
+static int chanwr_0_(int n__, integer *order, integer *ipitv, 
 	integer *irms, integer *irc, integer *ibits,
 			       struct lpc10_encoder_state *st)
 {
--- a/lpc10/dcbias.c
+++ b/lpc10/dcbias.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: dcbias.c,v $
-Revision 1.1  2007/04/16 21:56:39  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:40:23  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dcbias_(integer *len, real *speech, real *sigout);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int dcbias_(integer *len, real *speech, real *sigout);
+
 /* ********************************************************************* */
 
 /* 	DCBIAS Version 50 */
 
-/* $Log: dcbias.c,v $
-/* Revision 1.1  2007/04/16 21:56:39  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:40:23  jaf
  * Initial revision
--- a/lpc10/decode.c
+++ b/lpc10/decode.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: decode.c,v $
-Revision 1.1  2007/04/16 21:56:42  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -22,13 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: ham84_ 14 3 4 4 4 */
-/*:ref: median_ 4 3 4 4 4 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -36,6 +21,8 @@
 
 #include "f2c.h"
 
+extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -53,14 +40,7 @@
 
 /* 	DECODE Version 54 */
 
-/* $Log: decode.c,v $
-/* Revision 1.1  2007/04/16 21:56:42  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -189,68 +169,11 @@
     extern integer median_(integer *, integer *, integer *);
     integer ishift, errcnt, lsb;
 
-/* $Log: decode.c,v $
-/* Revision 1.1  2007/04/16 21:56:42  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:22:39  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:38  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
 
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log: decode.c,v $
-/* Revision 1.1  2007/04/16 21:56:42  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:22:39  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:38  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
 
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
-
 /*   LPC Processing control variables: */
 
 /* *** Read-only: initialized in setup */
@@ -275,8 +198,7 @@
 /* core of the coding and decoding routines.  Actually, I take that back. 
 */
 /* At least when compiling with f2c, the upper bound of DO loops is */
-/* stored in a local variable before the DO loop begins, and then that is 
-*/
+/* stored in a local variable before the DO loop begins, and then that is */
 /* compared against on each iteration. */
 /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */
 /* Similarly for quant, which is given a value of 2400 in SETUP.  quant */
@@ -510,9 +432,9 @@
 	}
 	for (i__ = 1; i__ <= 6; ++i__) {
 	    if ((i__1 = drc[i__ * 3 - 2] - drc[i__ * 3 - 3], (real) abs(i__1))
-		     >= corth[ixcor + (i__ + 2 << 2) - 5] && (i__2 = drc[i__ *
+		     >= corth[ixcor + ((i__ + 2) << 2) - 5] && (i__2 = drc[i__ *
 		     3 - 2] - drc[i__ * 3 - 1], (real) abs(i__2)) >= corth[
-		    ixcor + (i__ + 2 << 2) - 5]) {
+		    ixcor + ((i__ + 2) << 2) - 5]) {
 		irc[i__] = median_(&drc[i__ * 3 - 1], &drc[i__ * 3 - 2], &drc[
 			i__ * 3 - 3]);
 	    }
--- a/lpc10/deemp.c
+++ b/lpc10/deemp.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: deemp.c,v $
-Revision 1.1  2007/04/16 21:56:48  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:23:46  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -22,10 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,17 +21,12 @@
 
 #include "f2c.h"
 
+extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
+
 /* ***************************************************************** */
 
 /* 	DEEMP Version 48 */
 
-/* $Log: deemp.c,v $
-/* Revision 1.1  2007/04/16 21:56:48  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.2  1996/08/20  20:23:46  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
--- a/lpc10/difmag.c
+++ b/lpc10/difmag.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: difmag.c,v $
-Revision 1.1  2007/04/16 21:56:50  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:32:31  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
+
 /* ********************************************************************** */
 
 /* 	DIFMAG Version 49 */
 
-/* $Log: difmag.c,v $
-/* Revision 1.1  2007/04/16 21:56:50  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:32:31  jaf
  * Initial revision
--- a/lpc10/dyptrk.c
+++ b/lpc10/dyptrk.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: dyptrk.c,v $
-Revision 1.1  2007/04/16 21:56:54  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:25:29  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -22,11 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,6 +21,8 @@
 
 #include "f2c.h"
 
+extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -47,14 +36,7 @@
 
 /* 	DYPTRK Version 52 */
 
-/* $Log: dyptrk.c,v $
-/* Revision 1.1  2007/04/16 21:56:54  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:25:29  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -137,35 +119,6 @@
     real alpha, minsc, maxsc;
 
 /*       Arguments */
-/* $Log: dyptrk.c,v $
-/* Revision 1.1  2007/04/16 21:56:54  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:25:29  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:26  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/encode.c
+++ b/lpc10/encode.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: encode.c,v $
-Revision 1.1  2007/04/16 21:56:56  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision
  *
@@ -14,11 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
-/* comlen contrl_ 12 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,6 +13,8 @@
 
 #include "f2c.h"
 
+extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -43,14 +32,7 @@
 
 /* 	ENCODE Version 54 */
 
-/* $Log: encode.c,v $
-/* Revision 1.1  2007/04/16 21:56:56  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision
  * */
@@ -129,51 +111,10 @@
     /* Local variables */
     integer idel, nbit, i__, j, i2, i3, mrk;
 
-/* $Log: encode.c,v $
-/* Revision 1.1  2007/04/16 21:56:56  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.1  1996/08/19  22:32:21  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
 
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log: encode.c,v $
-/* Revision 1.1  2007/04/16 21:56:56  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.1  1996/08/19  22:32:21  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/energy.c
+++ b/lpc10/energy.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: energy.c,v $
-Revision 1.1  2007/04/16 21:57:00  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:32:17  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int energy_(integer *len, real *speech, real *rms);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int energy_(integer *len, real *speech, real *rms);
+
 /* ********************************************************************* */
 
 /* 	ENERGY Version 50 */
 
-/* $Log: energy.c,v $
-/* Revision 1.1  2007/04/16 21:57:00  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:32:17  jaf
  * Initial revision
--- a/lpc10/f2c.h
+++ b/lpc10/f2c.h
@@ -1,13 +1,5 @@
 /*
 
-$Log: f2c.h,v $
-Revision 1.1  2007/04/16 21:57:02  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:26:28  jaf
  * Any typedef defining a type that was used in lpc10_encoder_state or
  * lpc10_decoder_state struct's was commented out here and added to
--- a/lpc10/f2clib.c
+++ b/lpc10/f2clib.c
@@ -1,6 +1,10 @@
 /*
 
 $Log: f2clib.c,v $
+Revision 1.2  2007/04/18 13:59:59  rrt
+Remove $Log tokens and associated log messages (in many files, several
+copies of every log message were being written) and lots of warnings.
+
 Revision 1.1  2007/04/16 21:57:06  rrt
 LPC-10 support, documentation still to come; I wanted to land the code
 before 14.0.0 went into test, and I'll be busy tomorrow.
@@ -22,11 +26,9 @@
 
 #include "f2c.h"
 
-#ifdef KR_headers
-integer pow_ii(ap, bp) integer *ap, *bp;
-#else
+integer pow_ii(integer *ap, integer *bp);
+
 integer pow_ii(integer *ap, integer *bp)
-#endif
 {
 	integer pow, x, n;
 	unsigned long u;
@@ -55,12 +57,9 @@
 	}
 
 
+double r_sign(real *a, real *b);
 
-#ifdef KR_headers
-double r_sign(a,b) real *a, *b;
-#else
 double r_sign(real *a, real *b)
-#endif
 {
 double x;
 x = (*a >= 0 ? *a : - *a);
@@ -68,15 +67,11 @@
 }
 
 
+integer i_nint(real *x);
 
-#ifdef KR_headers
-double floor();
-integer i_nint(x) real *x;
-#else
 #undef abs
 #include "math.h"
 integer i_nint(real *x)
-#endif
 {
 return( (*x)>=0 ?
 	floor(*x + .5) : -floor(.5 - *x) );
--- a/lpc10/ham84.c
+++ b/lpc10/ham84.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: ham84.c,v $
-Revision 1.1  2007/04/16 21:57:14  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:32:07  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ham84_(integer *input, integer *output, integer *errcnt);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int ham84_(integer *input, integer *output, integer *errcnt);
+
 /* ***************************************************************** */
 
 /* 	HAM84 Version 45G */
 
-/* $Log: ham84.c,v $
-/* Revision 1.1  2007/04/16 21:57:14  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:32:07  jaf
  * Initial revision
--- a/lpc10/hp100.c
+++ b/lpc10/hp100.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: hp100.c,v $
-Revision 1.1  2007/04/16 21:57:16  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:28:05  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -22,12 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int hp100_(real *speech, integer *start, integer *end,
-		  struct lpc10_encoder_state *st);
-extern int inithp100_(void);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,51 +21,13 @@
 
 #include "f2c.h"
 
+extern int hp100_(real *speech, integer *start, integer *end,
+		  struct lpc10_encoder_state *st);
+extern int inithp100_(void);
+
 /* ********************************************************************* */
 
 /*      HP100 Version 55 */
-
-/* $Log: hp100.c,v $
-/* Revision 1.1  2007/04/16 21:57:16  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:28:05  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:32:04  jaf
- * Initial revision
- * */
-/* Revision 1.6  1996/03/15  16:45:25  jaf */
-/* Rearranged a few comments. */
-
-/* Revision 1.5  1996/03/14  23:20:54  jaf */
-/* Added comments about when INITHP100 should be used. */
-
-/* Revision 1.4  1996/03/14  23:08:08  jaf */
-/* Added an entry named INITHP100 that initializes the local state of */
-/* subroutine HP100. */
-
-/* Revision 1.3  1996/03/14  22:09:20  jaf */
-/* Comments added explaining which of the local variables of this */
-/* subroutine need to be saved from one invocation to the next, and which */
-/* do not. */
-
-/* Revision 1.2  1996/02/12  15:05:54  jaf */
-/* Added lots of comments explaining why I changed one line, which was a */
-/* declaration with initializations. */
-
-/* Revision 1.1  1996/02/07 14:47:12  jaf */
-/* Initial revision */
-
 
 /* ********************************************************************* */
 
--- a/lpc10/invert.c
+++ b/lpc10/invert.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: invert.c,v $
-Revision 1.1  2007/04/16 21:57:18  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:32:00  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int invert_(integer *order, real *phi, real *psi, real *rc);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,18 +13,13 @@
 
 #include "f2c.h"
 
+extern int invert_(integer *order, real *phi, real *psi, real *rc);
+
 /* **************************************************************** */
 
 /* 	INVERT Version 45G */
 
-/* $Log: invert.c,v $
-/* Revision 1.1  2007/04/16 21:57:18  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.1  1996/08/19  22:32:00  jaf
  * Initial revision
  * */
@@ -92,26 +75,6 @@
     real v[100]	/* was [10][10] */;
 
 /*       Arguments */
-/* $Log: invert.c,v $
-/* Revision 1.1  2007/04/16 21:57:18  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.1  1996/08/19  22:32:00  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
 
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
--- a/lpc10/irc2pc.c
+++ b/lpc10/irc2pc.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: irc2pc.c,v $
-Revision 1.1  2007/04/16 21:57:19  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:56  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,18 +13,13 @@
 
 #include "f2c.h"
 
+extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
+
 /* ***************************************************************** */
 
 /* 	IRC2PC Version 48 */
 
-/* $Log: irc2pc.c,v $
-/* Revision 1.1  2007/04/16 21:57:19  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.1  1996/08/19  22:31:56  jaf
  * Initial revision
  * */
@@ -83,27 +66,6 @@
     integer i__, j;
 
 /* 	Arguments */
-/* $Log: irc2pc.c,v $
-/* Revision 1.1  2007/04/16 21:57:19  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.1  1996/08/19  22:31:56  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Local variables that need not be saved */
--- a/lpc10/ivfilt.c
+++ b/lpc10/ivfilt.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: ivfilt.c,v $
-Revision 1.1  2007/04/16 21:57:20  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:53  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,18 +13,13 @@
 
 #include "f2c.h"
 
+extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
+
 /* ********************************************************************* */
 
 /* 	IVFILT Version 48 */
 
-/* $Log: ivfilt.c,v $
-/* Revision 1.1  2007/04/16 21:57:20  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.1  1996/08/19  22:31:53  jaf
  * Initial revision
  * */
@@ -93,7 +76,7 @@
     /* Function Body */
     for (i__ = 1; i__ <= 3; ++i__) {
 	r__[i__ - 1] = 0.f;
-	k = i__ - 1 << 2;
+	k = (i__ - 1) << 2;
 	i__1 = *len;
 	for (j = (i__ << 2) + *len - *nsamp; j <= i__1; j += 2) {
 	    r__[i__ - 1] += lpbuf[j] * lpbuf[j - k];
--- a/lpc10/lpcdec.c
+++ b/lpc10/lpcdec.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: lpcdec.c,v $
-Revision 1.1  2007/04/16 21:57:24  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -25,17 +17,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpcdec_(integer *bits, real *speech);
-extern int initlpcdec_(void);
-/* comlen contrl_ 12 */
-/*:ref: chanrd_ 14 5 4 4 4 4 4 */
-/*:ref: decode_ 14 7 4 4 4 4 4 6 6 */
-/*:ref: synths_ 14 6 4 4 6 6 6 4 */
-/*:ref: initdecode_ 14 0 */
-/*:ref: initsynths_ 14 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -43,6 +24,9 @@
 
 #include "f2c.h"
 
+extern int lpcdec_(integer *bits, real *speech);
+extern int initlpcdec_(void);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -58,14 +42,7 @@
 
 /* ***************************************************************** */
 
-/* $Log: lpcdec.c,v $
-/* Revision 1.1  2007/04/16 21:57:24  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -114,74 +91,10 @@
     integer irc[10], len;
     real rms;
 
-/* $Log: lpcdec.c,v $
-/* Revision 1.1  2007/04/16 21:57:24  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:30:11  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Changed name of function from lpcenc_ to lpc10_encode, simply to make
- * all lpc10 functions have more consistent naming with each other.
- *
- * Revision 1.1  1996/08/19  22:31:48  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
 
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log: lpcdec.c,v $
-/* Revision 1.1  2007/04/16 21:57:24  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:30:11  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Changed name of function from lpcenc_ to lpc10_encode, simply to make
- * all lpc10 functions have more consistent naming with each other.
- *
- * Revision 1.1  1996/08/19  22:31:48  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
-
 /*   LPC Processing control variables: */
 
 /* *** Read-only: initialized in setup */
--- a/lpc10/lpcenc.c
+++ b/lpc10/lpcenc.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: lpcenc.c,v $
-Revision 1.1  2007/04/16 21:57:26  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:31:21  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -25,17 +17,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpcenc_(real *speech, integer *bits);
-extern int initlpcenc_(void);
-/*:ref: prepro_ 14 2 6 4 */
-/*:ref: analys_ 14 5 6 4 4 6 6 */
-/*:ref: encode_ 14 7 4 4 6 6 4 4 4 */
-/*:ref: chanwr_ 14 5 4 4 4 4 4 */
-/*:ref: initprepro_ 14 0 */
-/*:ref: initanalys_ 14 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -43,6 +24,9 @@
 
 #include "f2c.h"
 
+extern int lpcenc_(real *speech, integer *bits);
+extern int initlpcenc_(void);
+
 /* Table of constant values */
 
 static integer c__180 = 180;
@@ -50,14 +34,7 @@
 
 /* ***************************************************************** */
 
-/* $Log: lpcenc.c,v $
-/* Revision 1.1  2007/04/16 21:57:26  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:31:21  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -110,37 +87,6 @@
     real rms;
 
 /*       Arguments */
-/* $Log: lpcenc.c,v $
-/* Revision 1.1  2007/04/16 21:57:26  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:31:21  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Changed name of function from lpcenc_ to lpc10_encode, simply to make
- * all lpc10 functions have more consistent naming with each other.
- *
- * Revision 1.1  1996/08/19  22:31:44  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
 
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
--- a/lpc10/lpcini.c
+++ b/lpc10/lpcini.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: lpcini.c,v $
-Revision 1.1  2007/04/16 21:57:30  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state
  * and lpc10_decoder_state structures.
@@ -18,13 +10,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpcini_(void);
-/* comlen contrl_ 12 */
-/*:ref: initlpcenc_ 14 0 */
-/*:ref: initlpcdec_ 14 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -32,6 +17,8 @@
 
 #include "f2c.h"
 
+extern int lpcini_(void);
+
 #include <malloc.h>
 
 /* Common Block Declarations */
@@ -45,14 +32,7 @@
 
 /* ***************************************************************** */
 
-/* $Log: lpcini.c,v $
-/* Revision 1.1  2007/04/16 21:57:30  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state
  * and lpc10_decoder_state structures.
@@ -71,59 +51,6 @@
 
 /* Subroutine */ int lpcini_(void)
 {
-
-/* $Log: lpcini.c,v $
-/* Revision 1.1  2007/04/16 21:57:30  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:35:41  jaf
- * Added functions for allocating and initializing lpc10_encoder_state
- * and lpc10_decoder_state structures.
- *
- * Revision 1.1  1996/08/19  22:31:40  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
-/*   LPC Configuration parameters: */
-/* Frame size, Prediction order, Pitch period */
-/* $Log: lpcini.c,v $
-/* Revision 1.1  2007/04/16 21:57:30  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:35:41  jaf
- * Added functions for allocating and initializing lpc10_encoder_state
- * and lpc10_decoder_state structures.
- *
- * Revision 1.1  1996/08/19  22:31:40  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/lpfilt.c
+++ b/lpc10/lpfilt.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: lpfilt.c,v $
-Revision 1.1  2007/04/16 21:57:31  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:35  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
+
 /* *********************************************************************** */
 
 /* 	LPFILT Version 55 */
 
-/* $Log: lpfilt.c,v $
-/* Revision 1.1  2007/04/16 21:57:31  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:31:35  jaf
  * Initial revision
--- a/lpc10/median.c
+++ b/lpc10/median.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: median.c,v $
-Revision 1.1  2007/04/16 21:57:37  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:31  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer median_(integer *d1, integer *d2, integer *d3);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern integer median_(integer *d1, integer *d2, integer *d3);
+
 /* ********************************************************************* */
 
 /* 	MEDIAN Version 45G */
 
-/* $Log: median.c,v $
-/* Revision 1.1  2007/04/16 21:57:37  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:31:31  jaf
  * Initial revision
--- a/lpc10/mload.c
+++ b/lpc10/mload.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: mload.c,v $
-Revision 1.1  2007/04/16 21:57:41  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:25  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
+
 /* ***************************************************************** */
 
 /* 	MLOAD Version 48 */
 
-/* $Log: mload.c,v $
-/* Revision 1.1  2007/04/16 21:57:41  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:31:25  jaf
  * Initial revision
--- a/lpc10/onset.c
+++ b/lpc10/onset.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: onset.c,v $
-Revision 1.1  2007/04/16 21:57:43  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:37:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -22,10 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,6 +21,8 @@
 
 #include "f2c.h"
 
+extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
+
 /* Table of constant values */
 
 static real c_b2 = 1.f;
@@ -41,15 +31,7 @@
 
 /* 	ONSET Version 49 */
 
-/* $Log: onset.c,v $
-/* Revision 1.1  2007/04/16 21:57:43  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:37:55  jaf
+/* Revision 1.2  1996/08/20  20:37:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
  * argument.
@@ -144,34 +126,6 @@
     real *fpc;
 
 /*       Arguments */
-/* $Log: onset.c,v $
-/* Revision 1.1  2007/04/16 21:57:43  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:37:55  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:31:18  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
 
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
--- a/lpc10/pitsyn.c
+++ b/lpc10/pitsyn.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: pitsyn.c,v $
-Revision 1.1  2007/04/16 21:57:45  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:40:12  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -22,10 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,18 +21,13 @@
 
 #include "f2c.h"
 
+extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
+
 /* ***************************************************************** */
 
 /* 	PITSYN Version 53 */
 
-/* $Log: pitsyn.c,v $
-/* Revision 1.1  2007/04/16 21:57:45  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:40:12  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -124,7 +107,7 @@
     logical *first;
 
     /* System generated locals */
-    integer rci_dim1, rci_offset, i__1, i__2;
+    integer rci_dim1 = 0, rci_offset, i__1, i__2;
     real r__1;
 
     /* Builtin functions */
@@ -144,34 +127,6 @@
     real xxy;
 
 /*       Arguments */
-/* $Log: pitsyn.c,v $
-/* Revision 1.1  2007/04/16 21:57:45  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:40:12  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:31:12  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
 
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
--- a/lpc10/placea.c
+++ b/lpc10/placea.c
@@ -1,6 +1,10 @@
 /*
 
 $Log: placea.c,v $
+Revision 1.2  2007/04/18 14:00:38  rrt
+Remove $Log tokens and associated log messages (in many files, several
+copies of every log message were being written) and lots of warnings.
+
 Revision 1.1  2007/04/16 21:57:47  rrt
 LPC-10 support, documentation still to come; I wanted to land the code
 before 14.0.0 went into test, and I'll be busy tomorrow.
@@ -14,10 +18,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,19 +25,13 @@
 
 #include "f2c.h"
 
+extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
+
 /* *********************************************************************** */
 
 /* 	PLACEA Version 48 */
 
-/* $Log: placea.c,v $
-/* Revision 1.1  2007/04/16 21:57:47  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.1  1996/08/19  22:31:07  jaf
+/* Revision 1.1  1996/08/19  22:31:07  jaf
  * Initial revision
  * */
 /* Revision 1.5  1996/03/19  20:41:55  jaf */
@@ -142,18 +136,18 @@
 /*   is not altered from MAXWIN, since this would defeat the purpose */
 /*   of phase-synchronous placement. */
 /* Check for case 1 and case 2 */
-    allv = voibuf[(*af - 2 << 1) + 2] == 1;
-    allv = allv && voibuf[(*af - 1 << 1) + 1] == 1;
-    allv = allv && voibuf[(*af - 1 << 1) + 2] == 1;
+    allv = voibuf[((*af - 2) << 1) + 2] == 1;
+    allv = allv && voibuf[((*af - 1) << 1) + 1] == 1;
+    allv = allv && voibuf[((*af - 1) << 1) + 2] == 1;
     allv = allv && voibuf[(*af << 1) + 1] == 1;
     allv = allv && voibuf[(*af << 1) + 2] == 1;
     winv = voibuf[(*af << 1) + 1] == 1 || voibuf[(*af << 1) + 2] == 1;
-    if (allv || winv && *obound == 0) {
+    if (allv || (winv && *obound == 0)) {
 /* APHASE:  Phase synchronous window placement. */
 /* Get minimum lower index of the window. */
-	i__ = (lrange + *ipitch - 1 - awin[(*af - 1 << 1) + 1]) / *ipitch;
+	i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch;
 	i__ *= *ipitch;
-	i__ += awin[(*af - 1 << 1) + 1];
+	i__ += awin[((*af - 1) << 1) + 1];
 /* L = the actual length of this frame's analysis window. */
 	l = *maxwin;
 /* Calculate the location where a perfectly centered window would star
--- a/lpc10/placev.c
+++ b/lpc10/placev.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: placev.c,v $
-Revision 1.1  2007/04/16 21:57:53  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:31:02  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,18 +13,13 @@
 
 #include "f2c.h"
 
+extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
+
 /* ****************************************************************** */
 
 /* 	PLACEV Version 48 */
 
-/* $Log: placev.c,v $
-/* Revision 1.1  2007/04/16 21:57:53  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.1  1996/08/19  22:31:02  jaf
  * Initial revision
  * */
@@ -178,12 +161,14 @@
 /*   placement lost. */
 /* Compute the placement range */
     /* Parameter adjustments */
+    (void)oslen;
+    (void)dvwinh;
     --osbuf;
     vwin -= 3;
 
     /* Function Body */
 /* Computing MAX */
-    i__1 = vwin[(*af - 1 << 1) + 2] + 1, i__2 = (*af - 2) * *lframe + 1;
+    i__1 = vwin[((*af - 1) << 1) + 2] + 1, i__2 = (*af - 2) * *lframe + 1;
     lrange = max(i__1,i__2);
     hrange = *af * *lframe;
 /* Compute OSPTR1, so the following code only looks at relevant onsets. */
@@ -197,7 +182,7 @@
 /* Check for case 1 first (fast case): */
     if (osptr1 <= 1 || osbuf[osptr1 - 1] < lrange) {
 /* Computing MAX */
-	i__1 = vwin[(*af - 1 << 1) + 2] + 1;
+	i__1 = vwin[((*af - 1) << 1) + 2] + 1;
 	vwin[(*af << 1) + 1] = max(i__1,*dvwinl);
 	vwin[(*af << 1) + 2] = vwin[(*af << 1) + 1] + *maxwin - 1;
 	*obound = 0;
--- a/lpc10/preemp.c
+++ b/lpc10/preemp.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: preemp.c,v $
-Revision 1.1  2007/04/16 21:57:56  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:30:58  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
+
 /* ******************************************************************* */
 
 /* 	PREEMP Version 55 */
 
-/* $Log: preemp.c,v $
-/* Revision 1.1  2007/04/16 21:57:56  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:30:58  jaf
  * Initial revision
--- a/lpc10/prepro.c
+++ b/lpc10/prepro.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: prepro.c,v $
-Revision 1.1  2007/04/16 21:58:00  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:40:51  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -22,13 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int prepro_(real *speech, integer *length,
-		   struct lpc10_encoder_state *st)
-/*:ref: hp100_ 14 3 6 4 4 */
-/*:ref: inithp100_ 14 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -36,6 +21,9 @@
 
 #include "f2c.h"
 
+extern int prepro_(real *speech, integer *length,
+		   struct lpc10_encoder_state *st);
+
 /* Table of constant values */
 
 static integer c__1 = 1;
@@ -44,13 +32,6 @@
 
 /* 	PREPRO Version 48 */
 
-/* $Log: prepro.c,v $
-/* Revision 1.1  2007/04/16 21:58:00  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.2  1996/08/20  20:40:51  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
--- a/lpc10/random.c
+++ b/lpc10/random.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: random.c,v $
-Revision 1.1  2007/04/16 21:58:05  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:41:32  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -22,10 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer random_(struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,17 +21,12 @@
 
 #include "f2c.h"
 
+extern integer random_(struct lpc10_decoder_state *st);
+
 /* ********************************************************************** */
 
 /* 	RANDOM Version 49 */
 
-/* $Log: random.c,v $
-/* Revision 1.1  2007/04/16 21:58:05  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.2  1996/08/20  20:41:32  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
--- a/lpc10/rcchk.c
+++ b/lpc10/rcchk.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: rcchk.c,v $
-Revision 1.1  2007/04/16 21:58:08  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:30:41  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int rcchk_(integer *order, real *rc1f, real *rc2f);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int rcchk_(integer *order, real *rc1f, real *rc2f);
+
 /* ********************************************************************* */
 
 /* 	RCCHK Version 45G */
 
-/* $Log: rcchk.c,v $
-/* Revision 1.1  2007/04/16 21:58:08  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:30:41  jaf
  * Initial revision
--- a/lpc10/synths.c
+++ b/lpc10/synths.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: synths.c,v $
-Revision 1.1  2007/04/16 21:58:10  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -22,18 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: pitsyn_ 14 12 4 4 4 6 6 4 4 4 6 6 4 6 */
-/*:ref: irc2pc_ 14 5 6 6 4 6 6 */
-/*:ref: bsynz_ 14 7 6 4 4 6 6 6 6 */
-/*:ref: deemp_ 14 2 6 4 */
-/*:ref: initpitsyn_ 14 0 */
-/*:ref: initbsynz_ 14 0 */
-/*:ref: initdeemp_ 14 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -41,6 +21,8 @@
 
 #include "f2c.h"
 
+extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -58,14 +40,7 @@
 
 /* 	SYNTHS Version 54 */
 
-/* $Log: synths.c,v $
-/* Revision 1.1  2007/04/16 21:58:10  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_decoder_state that is passed as an
@@ -169,7 +144,7 @@
     extern /* Subroutine */ int deemp_(real *, integer *, struct lpc10_decoder_state *);
     real ratio;
     integer ipiti[16];
-    extern /* Subroutine */ bsynz_(real *, integer *, 
+    extern int bsynz_(real *, integer *, 
 	    integer *, real *, real *, real *, real *, struct lpc10_decoder_state *), irc2pc_(real *, real *
 	    , integer *, real *, real *);
     real g2pass;
@@ -179,67 +154,9 @@
 	    integer *, real *, struct lpc10_decoder_state *);
     real rci[160]	/* was [10][16] */;
 
-/* $Log: synths.c,v $
-/* Revision 1.1  2007/04/16 21:58:10  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:42:59  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:30:33  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:03:47  jaf */
-/* Removed definitions for any constants that were no longer used. */
-
-/* Revision 1.2  1996/03/26  19:34:33  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:43:51  jaf */
-/* Initial revision */
-
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log: synths.c,v $
-/* Revision 1.1  2007/04/16 21:58:10  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:42:59  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_decoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_decoder_state().
- *
- * Revision 1.1  1996/08/19  22:30:33  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/tbdm.c
+++ b/lpc10/tbdm.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: tbdm.c,v $
-Revision 1.1  2007/04/16 21:58:11  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:30:26  jaf
  * Initial revision
  *
@@ -14,11 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
-/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,17 +13,12 @@
 
 #include "f2c.h"
 
+extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
+
 /* ********************************************************************** */
 
 /* 	TBDM Version 49 */
 
-/* $Log: tbdm.c,v $
-/* Revision 1.1  2007/04/16 21:58:11  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:30:26  jaf
  * Initial revision
--- a/lpc10/voicin.c
+++ b/lpc10/voicin.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: voicin.c,v $
-Revision 1.1  2007/04/16 21:58:13  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.2  1996/08/20  20:45:00  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -22,12 +14,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,6 +21,8 @@
 
 #include "f2c.h"
 
+extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
+
 /* Common Block Declarations */
 
 extern struct {
@@ -48,14 +36,7 @@
 
 /* 	VOICIN Version 52 */
 
-/* $Log: voicin.c,v $
-/* Revision 1.1  2007/04/16 21:58:13  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
 /*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
  * Revision 1.2  1996/08/20  20:45:00  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
  * code, and put them in struct lpc10_encoder_state that is passed as an
@@ -261,7 +242,7 @@
 	    ;
 
     /* System generated locals */
-    integer inbuf_offset, lpbuf_offset, i__1, i__2;
+    integer inbuf_offset = 0, lpbuf_offset = 0, i__1, i__2;
     real r__1, r__2;
 
     /* Builtin functions */
@@ -289,37 +270,9 @@
     real *snr;
     real snr2;
 
+    (void)af;
 /* 	Global Variables: */
 /*       Arguments */
-/* $Log: voicin.c,v $
-/* Revision 1.1  2007/04/16 21:58:13  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
-/*
- * Revision 1.2  1996/08/20  20:45:00  jaf
- * Removed all static local variables that were SAVE'd in the Fortran
- * code, and put them in struct lpc10_encoder_state that is passed as an
- * argument.
- *
- * Removed init function, since all initialization is now done in
- * init_lpc10_encoder_state().
- *
- * Revision 1.1  1996/08/19  22:30:14  jaf
- * Initial revision
- * */
-/* Revision 1.3  1996/03/29  22:05:55  jaf */
-/* Commented out the common block variables that are not needed by the */
-/* embedded version. */
-
-/* Revision 1.2  1996/03/26  19:34:50  jaf */
-/* Added comments indicating which constants are not needed in an */
-/* application that uses the LPC-10 coder. */
-
-/* Revision 1.1  1996/02/07  14:44:09  jaf */
-/* Initial revision */
 
 /*   LPC Processing control variables: */
 
--- a/lpc10/vparms.c
+++ b/lpc10/vparms.c
@@ -1,13 +1,5 @@
 /*
 
-$Log: vparms.c,v $
-Revision 1.1  2007/04/16 21:58:17  rrt
-LPC-10 support, documentation still to come; I wanted to land the code
-before 14.0.0 went into test, and I'll be busy tomorrow.
-
-Not highly tested either, but it's just a format, doesn't interfere
-with anything else, and I'll get on that case before we go stable.
-
  * Revision 1.1  1996/08/19  22:30:04  jaf
  * Initial revision
  *
@@ -14,10 +6,6 @@
 
 */
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
-#endif
-
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -25,6 +13,8 @@
 
 #include "f2c.h"
 
+extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
+
 /* Table of constant values */
 
 static real c_b2 = 1.f;
@@ -33,13 +23,6 @@
 
 /* 	VPARMS Version 50 */
 
-/* $Log: vparms.c,v $
-/* Revision 1.1  2007/04/16 21:58:17  rrt
-/* LPC-10 support, documentation still to come; I wanted to land the code
-/* before 14.0.0 went into test, and I'll be busy tomorrow.
-/*
-/* Not highly tested either, but it's just a format, doesn't interfere
-/* with anything else, and I'll get on that case before we go stable.
 /*
  * Revision 1.1  1996/08/19  22:30:04  jaf
  * Initial revision