[Java] cleanups

[Ben Elliston]

Per Bothner <per@bothner.com> writes:

> Feel tree to get rid of them.  What's in xref.[ch] doesn't look terribly
> interesting, and none of it appears to be called from anywhere.  At
> least a grep in gcc/java* fails to find anything that actually calls
> the functions and macros exported by xref.[ch].

Thanks.  Actually, expand_xref() is called from parse.y, so I'll
preserve that.

> (I assume you posted this patch to gcc-patches as well?)

Not recently, no.  I'll post the patch I'm committing, just for the
record.  Thanks!

2004-11-23  Ben Elliston  <bje@au.ibm.com>

	* xref.h (xref_flag_value): Remove.
	(xref_set_data, xref_get_data): Likewise.
	(xref_set_current_fp): Likewise.
	(XREF_NONE): Likewise.
	(XREF_GET_DATA): Likewise.
	* xref.c (xref_flag_value): Remove.
	(xref_set_data, xref_get_data): Likewise.
	(xref_set_current_fp): Likewise.

Index: xref.h
===================================================================
RCS file: /home/bje/gcc-cvs/gcc/gcc/java/xref.h,v
retrieving revision 1.10
diff -u -p -r1.10 xref.h
--- xref.h	9 Jan 2003 23:16:56 -0000	1.10
+++ xref.h	23 Nov 2004 06:48:15 -0000
@@ -24,25 +24,12 @@ of Sun Microsystems, Inc. in the United 
 The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 /* Exported functions. */
-int xref_flag_value (const char *);
 void expand_xref (tree);
-void xref_set_data (int, void *);
-void *xref_get_data (int);
-void xref_set_current_fp (FILE *);
-
-/* flag_emit_xref range of possible values. */
-
-enum {
-  XREF_NONE = 0
-};
 
 /* Lookup table to be used with the value of flag_emit_xref */
-
 typedef struct {
   char *key;			         /* Activator in -fxref=<key>  */
   void (*expand) (FILE *, tree);         /* Function to write xrefs out */
   FILE *fp;			         /* fp to use during the call.  */
   void *data;			         /* Placeholder for additional data */
 } xref_flag_table;
-
-#define XREF_GET_DATA(FLAG, T) ((T)xref_get_data (FLAG))
Index: xref.c
===================================================================
RCS file: /home/bje/gcc-cvs/gcc/gcc/java/xref.c,v
retrieving revision 1.15
diff -u -p -r1.15 xref.c
--- xref.c	12 Jan 2003 02:14:56 -0000	1.15
+++ xref.c	23 Nov 2004 06:48:15 -0000
@@ -38,36 +38,6 @@ static xref_flag_table xref_table [] = {
   {NULL, NULL, NULL, NULL},
 };
 
-/* Decode an xref flag value. Return 0 if the flag wasn't found. */
-
-int
-xref_flag_value (const char *flag)
-{
-  int i;
-  for (i = 0; xref_table [i].key; i++)
-    if (!strcmp (flag, xref_table [i].key))
-      return i+1;
-  return 0;
-}
-
-void
-xref_set_data (int flag, void *data)
-{
-  xref_table [flag-1].data = data;
-}
-
-void *
-xref_get_data (int flag)
-{
-  return xref_table [flag-1].data;
-}
-
-void
-xref_set_current_fp (FILE *fp)
-{
-  xref_table [flag_emit_xref-1].fp = fp;
-}
-
 /* Branch to the right xref "back-end".  */
 
 void
@@ -87,6 +57,3 @@ expand_xref (tree node)
 
   (*current_expand) (fp, node);
 }
-
-/* Implementation of the xref back-ends. */
-