2001-03-06 J.T. Conklin <jtc@redback.com>

        * symtab.h (decode_line_1): Removed declaration.

        * symfile.c (#include <assert.h>): Removed.

        * arch-utils.c (#include <ctype.h>): Removed.
        * c-typeprint.c: Likewise.
        * dbxread.c: Likewise.
        * gdbtypes.c: Likewise.
        * target.c: Likewise.
        * os9kread.c: Likewise.

        * c-valprint.c (#include "demangle.h"): Removed.
        * ch-typeprint.c: Likewise.
        * eval.c: Likewise.
        * f-typeprint.c: Likewise.
        * f-valprint.c: Likewise.
        * m2-typeprint.c: Likewise.
        * typeprint.c: Likewise.
        * p-typeprint.c: Likewise.
        * valarith.c: Likewise.
        * valprint.c: Likewise.

        * m2-typeprint.c (#include "gdb_string.h"): Removed.
        * nlmread.c: Likewise.

        * mdebugread.c (#include "gdb-stabs.h"): Removed.
        * minsyms.c: Likewise.
        * mipsread.c: Likewise.
        * nlmread.c: Likewise.

        * m2-typeprint.c (#include "obstack.h"): Removed.
        * m2-valprint.c: Likewise.

        * event-loop.c (#include <setjmp.h>): Removed.

28 files changed, 47 insertions, 38 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 89992563f41..6f5b6cf55e7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,40 @@
+2001-03-06  J.T. Conklin  <jtc@redback.com>
+
+	* symtab.h (decode_line_1): Removed declaration.
+
+	* symfile.c (#include <assert.h>): Removed.
+
+	* arch-utils.c (#include <ctype.h>): Removed.
+	* c-typeprint.c: Likewise.
+	* dbxread.c: Likewise.
+	* gdbtypes.c: Likewise.
+	* target.c: Likewise.
+	* os9kread.c: Likewise.
+
+	* c-valprint.c (#include "demangle.h"): Removed.
+	* ch-typeprint.c: Likewise.
+	* eval.c: Likewise.
+	* f-typeprint.c: Likewise.
+	* f-valprint.c: Likewise.
+	* m2-typeprint.c: Likewise.
+	* typeprint.c: Likewise.
+	* p-typeprint.c: Likewise.
+	* valarith.c: Likewise.
+	* valprint.c: Likewise.
+
+	* m2-typeprint.c (#include "gdb_string.h"): Removed.
+	* nlmread.c: Likewise.
+
+	* mdebugread.c (#include "gdb-stabs.h"): Removed.
+	* minsyms.c: Likewise.
+	* mipsread.c: Likewise.
+	* nlmread.c: Likewise.
+
+	* m2-typeprint.c (#include "obstack.h"): Removed.
+	* m2-valprint.c: Likewise.
+
+	* event-loop.c (#include <setjmp.h>): Removed.
+
 2001-03-06  Stan Shebs  <shebs@apple.com>
 
 	* MAINTAINERS: Remove self from specific maintenance domains
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 536af332f93..f70a5f972f0 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -361,7 +361,9 @@ VERSION = 5.0
 DIST=gdb
 
 LINT=/usr/5bin/lint
-LINTFLAGS= $(BFD_CFLAGS)
+LINTFLAGS= $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
+	$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
+	$(INTL_CFLAGS)
 
 RUNTEST = `if [ -f $${rootsrc}/../dejagnu/runtest ] ; then \
 		echo $${rootsrc}/../dejagnu/runtest ; else echo runtest; \
@@ -1110,6 +1112,9 @@ lint: $(LINTFILES)
 	$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
 	   `echo $(DEPFILES) | sed 's/\.o /\.c /g'`
 
+flint:  $(filter-out %.y,$(LINTFILES)) $(DEPFILES:.c=.o)
+	flint co.lnt $(LINTFLAGS) $^
+
 gdb.cxref: $(SFILES)
 	cxref -I. $(SFILES) >gdb.cxref
 
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 152004ee715..bfa548b5f95 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -27,7 +27,6 @@
 /* Just include everything in sight so that the every old definition
    of macro is visible. */
 #include "gdb_string.h"
-#include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index d9bf8a339e8..bdc5a689ee1 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -38,7 +38,6 @@
 
 #include "gdb_string.h"
 #include <errno.h>
-#include <ctype.h>
 
 /* Flag indicating target was compiled by HP compiler */
 extern int hp_som_som_object_present;
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 914b32d47a2..a4bcfb43ca6 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -25,7 +25,6 @@
 #include "gdbtypes.h"
 #include "expression.h"
 #include "value.h"
-#include "demangle.h"
 #include "valprint.h"
 #include "language.h"
 #include "c-lang.h"
diff --git a/gdb/ch-typeprint.c b/gdb/ch-typeprint.c
index a5a001ca5c5..c217d2baa9e 100644
--- a/gdb/ch-typeprint.c
+++ b/gdb/ch-typeprint.c
@@ -31,7 +31,6 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "language.h"
-#include "demangle.h"
 #include "ch-lang.h"
 #include "typeprint.h"
 
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 6ad1e6dfbfb..56a1ccddf2d 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -44,7 +44,6 @@
 
 #include "obstack.h"
 #include "gdb_stat.h"
-#include <ctype.h>
 #include "symtab.h"
 #include "breakpoint.h"
 #include "command.h"
diff --git a/gdb/defs.h b/gdb/defs.h
index 03642e30ef5..6974fe28507 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -821,9 +821,9 @@ extern int longest_to_int (LONGEST);
 /* Assorted functions we can declare, now that const and volatile are 
    defined.  */
 
-extern char *savestring (const char *, int);
+extern char *savestring (const char *, size_t);
 
-extern char *msavestring (void *, const char *, int);
+extern char *msavestring (void *, const char *, size_t);
 
 extern char *mstrsave (void *, const char *);
 
diff --git a/gdb/eval.c b/gdb/eval.c
index 285d1d18704..71cd9282fec 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -28,7 +28,6 @@
 #include "expression.h"
 #include "target.h"
 #include "frame.h"
-#include "demangle.h"
 #include "language.h"		/* For CAST_IS_CONVERSION */
 #include "f-lang.h"		/* for array bound stuff */
 
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 0a2078c6d1a..0983fd34c46 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 #include "gdb_string.h"
 #include <errno.h>
-#include <setjmp.h>
 #include <sys/time.h>
 
 /* Type of the mask arguments to select. */
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 70da8f9a516..944b97d711b 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -33,7 +33,6 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "language.h"
-#include "demangle.h"
 #include "f-lang.h"
 #include "typeprint.h"
 #include "frame.h"		/* ??? */
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index a70a47c0b7a..48c511377e8 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -27,7 +27,6 @@
 #include "gdbtypes.h"
 #include "expression.h"
 #include "value.h"
-#include "demangle.h"
 #include "valprint.h"
 #include "language.h"
 #include "f-lang.h"
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index d97ba1bec79..73966f06d91 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1165,7 +1165,6 @@ check_typedef (register struct type *type)
 }
 
 /* New code added to support parsing of Cfront stabs strings */
-#include <ctype.h>
 #define INIT_EXTRA { pextras->len=0; pextras->str[0]='\0'; }
 #define ADD_EXTRA(c) { pextras->str[pextras->len++]=c; }
 
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 1a36f88b2a9..d2988cf6c2d 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -20,7 +20,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "obstack.h"
 #include "bfd.h"		/* Binary File Description */
 #include "symtab.h"
 #include "gdbtypes.h"
@@ -31,10 +30,7 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "language.h"
-#include "demangle.h"
 #include "m2-lang.h"
-
-#include "gdb_string.h"
 #include <errno.h>
 
 void
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index ad2447e964e..4613d4b3b12 100644
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -20,7 +20,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "obstack.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "valprint.h"
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index cb4a298377c..401a09ee086 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -79,8 +79,6 @@ typedef struct mips_extra_func_info
 #include "gdb_stat.h"
 #include "gdb_string.h"
 
-#include "gdb-stabs.h"
-
 #include "bfd.h"
 
 #include "coff/ecoff.h"		/* COFF-like aspects of ecoff files */
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 3292096915f..7608297a8e8 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -47,7 +47,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "demangle.h"
-#include "gdb-stabs.h"
 
 /* Accumulate the minimal symbols for each objfile in bunches of BUNCH_SIZE.
    At the end, copy them all into one newly allocated location on an objfile's
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index e478532406e..dac06fc001d 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -33,7 +33,6 @@
 #include "objfiles.h"
 #include "buildsym.h"
 #include "stabsread.h"
-#include "gdb-stabs.h"
 
 #include "coff/sym.h"
 #include "coff/internal.h"
diff --git a/gdb/nlmread.c b/gdb/nlmread.c
index ffc1c697cb0..0baf177ffb0 100644
--- a/gdb/nlmread.c
+++ b/gdb/nlmread.c
@@ -21,12 +21,10 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "gdb_string.h"
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdb-stabs.h"
 #include "buildsym.h"
 #include "stabsread.h"
 
diff --git a/gdb/os9kread.c b/gdb/os9kread.c
index 0ca4d456cf0..8dcf2519e2f 100644
--- a/gdb/os9kread.c
+++ b/gdb/os9kread.c
@@ -46,7 +46,6 @@
 
 #include "obstack.h"
 #include "gdb_stat.h"
-#include <ctype.h>
 #include "symtab.h"
 #include "breakpoint.h"
 #include "command.h"
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index df3553127a2..2f7ac59778c 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -32,7 +32,6 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "language.h"
-#include "demangle.h"
 #include "p-lang.h"
 #include "typeprint.h"
 
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 49ae314a389..111a51b26ab 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -39,7 +39,6 @@
 #include "obstack.h"
 #include "completer.h"
 
-#include <assert.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include "gdb_string.h"
diff --git a/gdb/symtab.h b/gdb/symtab.h
index ae352b959a4..a4f224d6872 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1347,11 +1347,6 @@ extern struct symtabs_and_lines decode_line_spec (char *, int);
 
 extern struct symtabs_and_lines decode_line_spec_1 (char *, int);
 
-/* From linespec.c */
-
-extern struct symtabs_and_lines decode_line_1 (char **,
-                                          int, struct symtab *, int, char ***);
-
 /* Symmisc.c */
 
 void maintenance_print_symbols (char *, int);
diff --git a/gdb/target.c b/gdb/target.c
index 400199a2c90..f21518ff04d 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include <errno.h>
-#include <ctype.h>
 #include "gdb_string.h"
 #include "target.h"
 #include "gdbcmd.h"
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 0ca51853481..444c78b7bfd 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -31,7 +31,6 @@
 #include "gdbcmd.h"
 #include "target.h"
 #include "language.h"
-#include "demangle.h"
 
 #include "gdb_string.h"
 #include <errno.h>
diff --git a/gdb/utils.c b/gdb/utils.c
index 79536de3085..df6046a93e6 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1155,7 +1155,7 @@ myread (int desc, char *addr, int len)
    Uses malloc to get the space.  Returns the address of the copy.  */
 
 char *
-savestring (const char *ptr, int size)
+savestring (const char *ptr, size_t size)
 {
   register char *p = (char *) xmalloc (size + 1);
   memcpy (p, ptr, size);
@@ -1164,7 +1164,7 @@ savestring (const char *ptr, int size)
 }
 
 char *
-msavestring (void *md, const char *ptr, int size)
+msavestring (void *md, const char *ptr, size_t size)
 {
   register char *p = (char *) xmmalloc (md, size + 1);
   memcpy (p, ptr, size);
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 7cfa33a5687..aaa393f4b10 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -27,7 +27,6 @@
 #include "expression.h"
 #include "target.h"
 #include "language.h"
-#include "demangle.h"
 #include "gdb_string.h"
 #include <math.h>
 
diff --git a/gdb/valprint.c b/gdb/valprint.c
index b073308da5f..2a80b9c7c0a 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -30,7 +30,6 @@
 #include "target.h"
 #include "obstack.h"
 #include "language.h"
-#include "demangle.h"
 #include "annotate.h"
 #include "valprint.h"