backout 6795209/6392640: breaks sparc build

4 files changed, 32 insertions, 22 deletions

diff --git a/usr/src/cmd/fmli/oh/if_form.c b/usr/src/cmd/fmli/oh/if_form.c
index bb951f44ae..b4aee060c8 100644
--- a/usr/src/cmd/fmli/oh/if_form.c
+++ b/usr/src/cmd/fmli/oh/if_form.c
@@ -2,8 +2,9 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +21,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -28,6 +29,8 @@
 /*	  All Rights Reserved  	*/
 
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #include	<ctype.h>
 #include	<stdio.h>
 #include	<string.h>
@@ -977,8 +980,6 @@ char *str;
     return(FAIL);
 }
 
-static int chk_page();
-
 /*
  * CHK_FORM returns the actual number of the FIRST field that
  * is invalid ....
@@ -988,6 +989,7 @@ chk_form()
 {
     register int n, page, fldnum;
     int savefield, savepage, retval;
+    static int chk_page();
 
     /*
      * Save current form page/field
diff --git a/usr/src/cmd/fmli/oh/if_init.c b/usr/src/cmd/fmli/oh/if_init.c
index b98f48db5d..cfaf5ff5f1 100644
--- a/usr/src/cmd/fmli/oh/if_init.c
+++ b/usr/src/cmd/fmli/oh/if_init.c
@@ -2,8 +2,9 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,13 +21,15 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*	Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #include	<stdio.h>
 #include	<curses.h>
 #include	<string.h>
@@ -224,9 +227,6 @@ char *strnsave();
 static int settoggle();
 static struct fm_mn Inits;
 
-static char *set_default();
-static int center_it();
-
 /*
 ** Front-end to parser(), which sets up defaults.
 */
@@ -236,6 +236,8 @@ char *initfile;
 {
 	register int i, numslks;
 	char  *permmsg, *get_def();
+	static char *set_default();
+	static int center_it();
 	static int free_inits = FALSE;
 	int sbutton;
 	FILE *fp;
diff --git a/usr/src/cmd/fmli/oh/scram.c b/usr/src/cmd/fmli/oh/scram.c
index 1b265bec20..bf644aba0e 100644
--- a/usr/src/cmd/fmli/oh/scram.c
+++ b/usr/src/cmd/fmli/oh/scram.c
@@ -2,8 +2,9 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +21,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -28,6 +29,8 @@
 /*	  All Rights Reserved  	*/
 
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #include <curses.h>
 #define	_SYS_TERMIO_H		/* sys/termio.h is included by curses.h */
 #include <fcntl.h>
@@ -66,7 +69,6 @@ static int pack();
 static int unpack();
 static int keysave();
 static int keyvalid();
-static void regetkey();
 
 /*
  *	scram -- Scramble an object and pack all its parts into an OEU package
@@ -75,6 +77,7 @@ int
 scram(file)
 register char *file;
 {
+	static void regetkey();
 
 	strcpy(Keyprompt, "Please enter scramble key: ");
 	strcpy(Srcfile, file);
@@ -121,6 +124,7 @@ token t;
 {
 	struct ott_entry *entry, *path_to_ott();
 	struct stat buf;
+	static void regetkey();
 
 	if (t == TOK_CANCEL)
 		return (SUCCESS);
@@ -339,7 +343,7 @@ struct ott_entry *entry;
 		n = m + m;
 		tempstr[0] = Keycheck[n];
 		tempstr[1] = Keycheck[n+1];
-		buf[m] = (int)strtol(tempstr, NULL, 16);
+		buf[m] = (int) strtol(tempstr, NULL, 16);
 	}
 
 	if (cryptit(buf) == FAIL)
@@ -367,7 +371,7 @@ mkencrypart()
 	unsigned int left, right;
 	time_t clock;	/* EFT abs k16 */
 
-	clock = time((time_t *)0);	/* EFT abs k16 */
+	clock = time((time_t *) 0);	/* EFT abs k16 */
 	right = clock & 0177;
 	buf[0] = right;
 
diff --git a/usr/src/cmd/fmli/oh/slk.c b/usr/src/cmd/fmli/oh/slk.c
index 8e0f9cfe84..52f6c7226b 100644
--- a/usr/src/cmd/fmli/oh/slk.c
+++ b/usr/src/cmd/fmli/oh/slk.c
@@ -2,8 +2,9 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,13 +20,15 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 /* microsecond delay timer not available before SVR4.0   abs k18 */
 #ifdef PRE_SVR4_COMPILE
 #define DO_NOT_DELAY		
@@ -501,8 +504,6 @@ setup_slk_array()
 
 #define REDEFINED(x)	 ((x).label && (*((x).label) != '\0' || (x).tok < 0))
 
-static  void	showslks();
-
 /*
  * SETSLKS will make "slks" the currently displayed SLKS
  */
@@ -512,6 +513,7 @@ struct slk	slks[];
 int flag;
 {
 	register int	i, more_slks;
+	static  void	showslks();
 
 #ifdef _DEBUG
 	_debug(stderr, "in setslk!\n");