xref.h (xref_flag_value): Remove.

	* 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.

From-SVN: r91078

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 746ae9333b06ea5e2018ce325591372f07ac9938..fa30e096e6cc9399db532707899cbd979abbd85e 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2004-11-23  Ben Elliston  <bje@au.ibm.com>
 
        * gjavah.c (output_directory): Make static.

diff --git a/gcc/java/xref.c b/gcc/java/xref.c
index 51684509989439a2f05770fddaf642bb76537bb8..baccc5f3375bafd7846dfd7992962ccdee0a2786 100644 (file)
--- a/gcc/java/xref.c
+++ b/gcc/java/xref.c
@@ -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. */
-

diff --git a/gcc/java/xref.h b/gcc/java/xref.h
index 227bd59ac4f12e2274f7304800c3a2075be295b4..d75efa8e2ec49f5879a8bc8aef99b92fa41c244b 100644 (file)
--- a/gcc/java/xref.h
+++ b/gcc/java/xref.h
@@ -24,25 +24,12 @@ of Sun Microsystems, Inc. in the United States and other countries.
 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))