Changes to m4/src/freeze.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/06/16 01:32:41

Index: src/freeze.c
===================================================================
RCS file: /sources/m4/m4/src/freeze.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/freeze.c        27 Oct 2005 16:04:03 -0000      1.41
+++ src/freeze.c        16 Jun 2006 01:32:41 -0000      1.42
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 90, 91, 92, 93, 94, 2004, 2005
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006
                  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -332,14 +332,13 @@
 reload_frozen_state (m4 *context, const char *name)
 {
   FILE *file;
-  int version;
+  int version = 0;
   int character;
   int operation;
   char syntax;
   unsigned char *string[3];
   int allocated[3];
   int number[3];
-  const m4_builtin *bp;
 
 #define GET_CHARACTER \
   (character = getc (file))
@@ -403,7 +402,7 @@
     switch (character)
       {
       default:
-       M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+       M4ERROR ((EXIT_FAILURE, 0, _("Ill-formed frozen file")));
 
       case '\n':
 
@@ -445,7 +444,7 @@
        else
          {
            /* 3 argument 'F' operations are invalid for format version 1.  */
-           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formed frozen file")));
          }
 
        VALIDATE ('\n');
@@ -461,6 +460,7 @@
 
        /* Enter a macro having a builtin function as a definition.  */
        {
+         const m4_builtin *bp = NULL;
          lt_dlhandle handle   = 0;
 
          if (number[2] > 0)
@@ -502,7 +502,7 @@
        if (version < 2)
          {
            /* 'M' operator is not supported in format version 1. */
-           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formed frozen file")));
          }
 
        GET_CHARACTER;
@@ -520,7 +520,7 @@
        if (version < 2)
          {
            /* 'S' operator is not supported in format version 1. */
-           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formed frozen file")));
          }
 
        GET_CHARACTER;
@@ -643,7 +643,7 @@
        else
          {
            /* 3 argument 'T' operations are invalid for format version 1.  */
-           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formated frozen file")));
+           M4ERROR ((EXIT_FAILURE, 0, _("Ill-formed frozen file")));
          }
 
        VALIDATE ('\n');