BSD 4_3_Tahoe release

[unix-history] / usr / src / ucb / indent / parse.c

diff --git a/usr/src/ucb/indent/parse.c b/usr/src/ucb/indent/parse.c
index 831bcbd..f2dc39b 100644 (file)
--- a/usr/src/ucb/indent/parse.c
+++ b/usr/src/ucb/indent/parse.c
@@ -1,24 +1,27 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1976 Board of Trustees of the University of Illinois.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley and the University
+ * of Illinois, Urbana.  The name of either
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)parse.c    5.3 (Berkeley) 9/8/85";
-#endif not lint
+static char sccsid[] = "@(#)parse.c    5.6 (Berkeley) 6/29/88";
+#endif /* not lint */

 
 

-/*-
- *
- *                       Copyright (C) 1976
- *                             by the
- *                       Board of Trustees
- *                             of the
- *                     University of Illinois
- *
- *                      All rights reserved
- *
- *
+/*

  * FILE NAME:
  *     parse.c
  *
  * FILE NAME:
  *     parse.c
  *


@@ -53,8 +56,8 @@ static char sccsid[] = "@(#)parse.c   5.3 (Berkeley) 9/8/85";
  *
  */\f
 
  *
  */\f
 

-#include "./indent_globs.h";
-#include "./indent_codes.h";
+#include "./indent_globs.h"
+#include "./indent_codes.h"

 
 
 
 
 
 


@@ -188,7 +191,7 @@ parse(tk)
            case_ind = ps.i_l_follow + ps.case_indent;  /* cases should be one
                                                         * level down from
                                                         * switch */
            case_ind = ps.i_l_follow + ps.case_indent;  /* cases should be one
                                                         * level down from
                                                         * switch */

-           ps.i_l_follow + = ps.case_indent + 1;       /* statements should be
+           ps.i_l_follow += ps.case_indent + 1;        /* statements should be

                                                 * two levels in */
            ps.search_brace = btype_2;
            break;
                                                 * two levels in */
            ps.search_brace = btype_2;
            break;