5 files changed, 11 insertions, 19 deletions
diff --git a/usr/src/ucbcmd/sed/sed.h b/usr/src/ucbcmd/sed/sed.h
index f814ce4ef6..465d38613d 100644
--- a/usr/src/ucbcmd/sed/sed.h
+++ b/usr/src/ucbcmd/sed/sed.h
@@ -30,8 +30,6 @@
 #ifndef	_SED_H
 #define	_SED_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * sed -- stream  editor
  */
@@ -49,7 +47,6 @@
 #define PEEKC()		(*sp)
 #define UNGETC(c)	(--sp)
 #define RETURN(c)	cp = sp; return(ep);
-#define ERROR(c)	regerr(c)
 
 #define CEND	16
 #define CLNUM	14
@@ -153,7 +150,9 @@ char    *compsub();
 struct label    *search();
 char    *gline();
 char    *place();
-void comperr(char *);
+void comperr(char *) __NORETURN;
+void regerr(int) __NORETURN;
+#define ERROR(c)	regerr(c)
 void execute(char *);
 
 #endif	/* _SED_H */
diff --git a/usr/src/ucbcmd/sed/sed0.c b/usr/src/ucbcmd/sed/sed0.c
index 5be6112e36..1b5e3881bf 100644
--- a/usr/src/ucbcmd/sed/sed0.c
+++ b/usr/src/ucbcmd/sed/sed0.c
@@ -27,6 +27,7 @@
 /*	  All Rights Reserved  	*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include "sed.h"
 
@@ -70,8 +71,6 @@ char	TOOBIG[]	= "Suffix too large - 512 max: %s";
 extern int sed;	  /* IMPORTANT flag !!! */
 extern char *comple();
 
-extern char *malloc();
-
 static void dechain(void);
 static void fcomp(void);
 
diff --git a/usr/src/ucbcmd/sed/sed1.c b/usr/src/ucbcmd/sed/sed1.c
index c5f5d89144..c4777340df 100644
--- a/usr/src/ucbcmd/sed/sed1.c
+++ b/usr/src/ucbcmd/sed/sed1.c
@@ -27,10 +27,8 @@
 /*	Copyright (c) 1984 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -667,7 +665,7 @@ char *ep;
 	return(p);
 }
 
-int
+void
 regerr(int err)
 {
 	switch(err) {
@@ -726,7 +724,6 @@ regerr(int err)
 		exit(2);
 		break;
 	}
-	return (0);
 }
 
 static void
diff --git a/usr/src/ucbcmd/stty/stty.c b/usr/src/ucbcmd/stty/stty.c
index 65e79501d8..127a118c78 100644
--- a/usr/src/ucbcmd/stty/stty.c
+++ b/usr/src/ucbcmd/stty/stty.c
@@ -28,6 +28,7 @@
 /*	  All Rights Reserved  	*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <termio.h>
diff --git a/usr/src/ucbcmd/tset/tset.c b/usr/src/ucbcmd/tset/tset.c
index dcdbcac983..9e520f6a23 100644
--- a/usr/src/ucbcmd/tset/tset.c
+++ b/usr/src/ucbcmd/tset/tset.c
@@ -268,6 +268,7 @@
 #define	oldintr oldmodes.c_cc[VINTR]
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<termio.h>
 #include	<signal.h>
 
@@ -322,8 +323,6 @@
 
 #define	DEFTYPE		"unknown"
 
-#define	NOTTY		'x'
-
 /*
  * Baud Rate Conditionals
  */
@@ -390,7 +389,6 @@ char	Kill_char;		/* new kill character */
 char	Intr_char;		/* new interrupt character */
 char	Specialerase;	/* set => Erase_char only on terminals with backspace */
 
-char	Ttyid = NOTTY;		/* terminal identifier */
 char	*TtyType;		/* type of terminal */
 char	*DefType;		/* default type if none other computed */
 char	*NewType;		/* mapping identifier based on old flags */
@@ -559,6 +557,7 @@ main(int argc, char *argv[])
 				/* special erase: operate on all but TTY33 */
 				Specialerase = YES;
 				/* explicit fall-through to -e case */
+				/* FALLTHROUGH */
 
 			case 'e':	/* erase character */
 				if (*p == NULL)
@@ -775,14 +774,11 @@ mapold:				Map->Ident = NewType;
 	if (bufp && *bufp != '/')
 		(void) strcpy(bufp-8, "NOTHING"); /* overwrite only "TERMCAP" */
 	/* get current idea of terminal type from environment */
-	if (!Dash_h && TtyType == 0)
+	if (!Dash_h && TtyType == NULL)
 		TtyType = getenv("TERM");
 
-	if (!RepOnly && Ttyid == NOTTY && (TtyType == 0 || !Dash_h))
-		Ttyid = ttyname(FILEDES);
-
 	/* If still undefined, use DEFTYPE */
-	if (TtyType == 0) {
+	if (TtyType == NULL) {
 		TtyType = DEFTYPE;
 	}