This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
more cleanups
- From: "Ben Elliston" <bje at au1 dot ibm dot com>
- To: java-patches at gcc dot gnu dot org
- Date: 23 Nov 2004 12:04:03 +1100
- Subject: more cleanups
Okay for mainline?
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.c (xref_flag_value): Remove.
(xref_set_data, xref_get_data): Likewise.
(xref_set_current_fp): Likewise.
* gjavah.c (output_directory): Make static.
(temp_directory): Likewise.
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 01:02: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
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 01:02:15 -0000
@@ -24,11 +24,7 @@ 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. */
Index: gjavah.c
===================================================================
RCS file: /home/bje/gcc-cvs/gcc/gcc/java/gjavah.c,v
retrieving revision 1.121
diff -u -p -r1.121 gjavah.c
--- gjavah.c 8 Nov 2004 18:03:01 -0000 1.121
+++ gjavah.c 23 Nov 2004 01:02:15 -0000
@@ -61,10 +61,10 @@ int flag_jni = 0;
int flag_newer = 1;
/* Directory to place resulting files in. Set by -d option. */
-const char *output_directory = "";
+static const char *output_directory = "";
/* Directory to place temporary file. Set by -td option. Currently unused. */
-const char *temp_directory = "/tmp";
+static const char *temp_directory = "/tmp";
/* Number of friend functions we have to declare. */
static int friend_count;