5 files changed, 6 insertions, 4 deletions

diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 3da65d56af3e..24e56a821c82 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -36,6 +36,8 @@
 
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
+static const char rcsid[] =
+  "$FreeBSD$";
 #endif /* not lint && not SCCSID */
 
 /*
@@ -601,7 +603,7 @@ key_kprint(el, key, val, ntype)
 {
     el_bindings_t *fp;
     char unparsbuf[EL_BUFSIZ];
-    static char *fmt = "%-15s->  %s\n";
+    static const char fmt[] = "%-15s->  %s\n";
 
     if (val != NULL)
 	switch (ntype) {
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 18248f5300a4..65fd1a15669c 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1222,7 +1222,7 @@ term_echotc(el, argc, argv)
     int     arg_need, arg_cols, arg_rows;
     int     verbose = 0, silent = 0;
     char   *area;
-    static char *fmts = "%s\n", *fmtd = "%d\n";
+    static const char fmts[] = "%s\n", fmtd[] = "%d\n";
     struct termcapstr *t;
     char    buf[TC_BUFSIZE];
 
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index a8d8113d3165..43af00b191a6 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -265,7 +265,6 @@ extern int nvars;
 extern int ntags;
 
 extern char unionized;
-extern char line_format[];
 
 extern int   start_symbol;
 extern char  **symbol_name;
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 2130969c7b6a..31bb4be3eb2f 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -70,6 +70,7 @@ static void save_column __P((int, int));
 static void sort_actions __P((void));
 static void token_actions __P((void));
 
+static const char line_format[] = "#line %d \"%s\"\n";
 static int nvectors;
 static int nentries;
 static short **froms;
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 4e2e588241a9..8fb38faa5198 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -75,7 +75,7 @@ bucket **plhs;
 int name_pool_size;
 char *name_pool;
 
-char line_format[] = "#line %d \"%s\"\n";
+static const char line_format[] = "#line %d \"%s\"\n";
 
 static void add_symbol __P((void));
 static void advance_to_start __P((void));