[src/trunk]: src/lib/libedit More header cleanups from Ingo Schwarze.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5283700de972
branches:  trunk
changeset: 343612:5283700de972
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Feb 16 22:53:14 2016 +0000

description:
More header cleanups from Ingo Schwarze.

diffstat:

 lib/libedit/chared.c       |   6 ++++--
 lib/libedit/chared.h       |   5 +----
 lib/libedit/chartype.c     |  10 +++++++---
 lib/libedit/common.c       |   7 +++++--
 lib/libedit/el.h           |   4 +---
 lib/libedit/emacs.c        |   6 ++++--
 lib/libedit/filecomplete.c |   5 ++---
 lib/libedit/hist.c         |   6 ++++--
 lib/libedit/map.c          |   6 ++++--
 lib/libedit/parse.c        |   5 +++--
 lib/libedit/read.c         |   7 +++++--
 lib/libedit/refresh.c      |   5 ++---
 lib/libedit/search.c       |   5 +++--
 lib/libedit/tty.c          |   5 +++--
 lib/libedit/vi.c           |  16 +++++++++-------
 15 files changed, 57 insertions(+), 41 deletions(-)

diffs (truncated from 400 to 300 lines):

diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/chared.c
--- a/lib/libedit/chared.c      Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/chared.c      Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chared.c,v 1.45 2016/02/16 19:08:41 christos Exp $     */
+/*     $NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,14 +37,16 @@
 #if 0
 static char sccsid[] = "@(#)chared.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.45 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * chared.c: Character editor utilities
  */
+#include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "el.h"
 #include "common.h"
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/chared.h
--- a/lib/libedit/chared.h      Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/chared.h      Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chared.h,v 1.26 2016/02/16 19:08:41 christos Exp $     */
+/*     $NetBSD: chared.h,v 1.27 2016/02/16 22:53:14 christos Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,9 +40,6 @@
 #ifndef _h_el_chared
 #define        _h_el_chared
 
-#include <ctype.h>
-#include <string.h>
-
 #define        EL_MAXMACRO     10
 
 /*
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/chartype.c
--- a/lib/libedit/chartype.c    Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/chartype.c    Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chartype.c,v 1.17 2016/02/16 15:53:48 christos Exp $   */
+/*     $NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $   */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -38,10 +38,14 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.17 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $");
 #endif /* not lint && not SCCSID */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "el.h"
-#include <stdlib.h>
 
 #define CT_BUFSIZ ((size_t)1024)
 
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/common.c
--- a/lib/libedit/common.c      Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/common.c      Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: common.c,v 1.36 2016/02/16 19:11:25 christos Exp $     */
+/*     $NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,13 +37,16 @@
 #if 0
 static char sccsid[] = "@(#)common.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: common.c,v 1.36 2016/02/16 19:11:25 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * common.c: Common Editor functions
  */
+#include <ctype.h>
+#include <string.h>
+
 #include "el.h"
 #include "common.h"
 #include "parse.h"
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/el.h
--- a/lib/libedit/el.h  Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/el.h  Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: el.h,v 1.31 2016/02/16 19:11:25 christos Exp $ */
+/*     $NetBSD: el.h,v 1.32 2016/02/16 22:53:14 christos Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -48,8 +48,6 @@
 
 #include "histedit.h"
 #include "chartype.h"
-#include <stdio.h>
-#include <sys/types.h>
 
 #define        EL_BUFSIZ       ((size_t)1024)  /* Maximum line size            */
 
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/emacs.c
--- a/lib/libedit/emacs.c       Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/emacs.c       Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emacs.c,v 1.31 2016/02/16 19:08:41 christos Exp $      */
+/*     $NetBSD: emacs.c,v 1.32 2016/02/16 22:53:14 christos Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,13 +37,15 @@
 #if 0
 static char sccsid[] = "@(#)emacs.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: emacs.c,v 1.31 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: emacs.c,v 1.32 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * emacs.c: Emacs functions
  */
+#include <ctype.h>
+
 #include "el.h"
 #include "emacs.h"
 
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/filecomplete.c
--- a/lib/libedit/filecomplete.c        Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/filecomplete.c        Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecomplete.c,v 1.38 2016/02/16 19:08:41 christos Exp $       */
+/*     $NetBSD: filecomplete.c,v 1.39 2016/02/16 22:53:14 christos Exp $       */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.38 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.39 2016/02/16 22:53:14 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -40,7 +40,6 @@
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/hist.c
--- a/lib/libedit/hist.c        Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/hist.c        Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hist.c,v 1.23 2016/02/16 15:53:48 christos Exp $       */
+/*     $NetBSD: hist.c,v 1.24 2016/02/16 22:53:14 christos Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)hist.c     8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: hist.c,v 1.23 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.24 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,6 +45,8 @@
  * hist.c: History access functions
  */
 #include <stdlib.h>
+#include <string.h>
+
 #include "el.h"
 
 /* hist_init():
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/map.c
--- a/lib/libedit/map.c Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/map.c Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map.c,v 1.41 2016/02/16 19:08:41 christos Exp $        */
+/*     $NetBSD: map.c,v 1.42 2016/02/16 22:53:14 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,14 +37,16 @@
 #if 0
 static char sccsid[] = "@(#)map.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: map.c,v 1.41 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.42 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * map.c: Editor function definitions
  */
+#include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "el.h"
 #include "help.h"
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/parse.c
--- a/lib/libedit/parse.c       Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/parse.c       Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.33 2016/02/16 19:08:41 christos Exp $      */
+/*     $NetBSD: parse.c,v 1.34 2016/02/16 22:53:14 christos Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: parse.c,v 1.33 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.34 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -55,6 +55,7 @@
  *     setty
  */
 #include <stdlib.h>
+#include <string.h>
 
 #include "el.h"
 #include "parse.h"
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/read.c
--- a/lib/libedit/read.c        Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/read.c        Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: read.c,v 1.80 2016/02/16 15:53:48 christos Exp $       */
+/*     $NetBSD: read.c,v 1.81 2016/02/16 22:53:14 christos Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)read.c     8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: read.c,v 1.80 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.81 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,11 +45,14 @@
  * read.c: Clean this junk up! This is horrible code.
  *        Terminal read functions
  */
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <limits.h>
+
 #include "el.h"
 
 #define OKCMD  -1      /* must be -1! */
diff -r 7c98c363e8fe -r 5283700de972 lib/libedit/refresh.c
--- a/lib/libedit/refresh.c     Tue Feb 16 19:29:51 2016 +0000
+++ b/lib/libedit/refresh.c     Tue Feb 16 22:53:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: refresh.c,v 1.42 2016/02/16 15:53:48 christos Exp $    */
+/*     $NetBSD: refresh.c,v 1.43 2016/02/16 22:53:14 christos Exp $    */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c  8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: refresh.c,v 1.42 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.43 2016/02/16 22:53:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */