diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-16 05:00:28 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-16 05:00:28 +0000 |
commit | fac9986f014c807407242c154bf6051be4bea4a2 (patch) | |
tree | 860fe78d86598e2fda61d7494de344ebdf51c77a /libjava/prims.cc | |
parent | 184a3cd9c8064e201a0d475a046c1d3ed9daf773 (diff) | |
download | gcc-fac9986f014c807407242c154bf6051be4bea4a2.tar.gz |
* java/io/File.java: Implement Comparable<File>.
(compareTo): Removed.
* java/io/File.h: Rebuilt.
* classpath/lib/java/io/File.class: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126670 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/prims.cc')
-rw-r--r-- | libjava/prims.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 706ab4b7a3e..5d3a260e9d0 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -1262,7 +1262,11 @@ parse_x_arg (char* option_string) { // FIXME: fail if impossible to share class data } - + else + { + // Unrecognized. + return -1; + } return 0; } @@ -1571,21 +1575,20 @@ parse_init_args (JvVMInitArgs* vm_args) JVMTI::enabled = true; continue; } - else if (vm_args->ignoreUnrecognized) + else { + int r = -1; if (option_string[0] == '_') - parse_x_arg (option_string + 1); - else if (! strncmp (option_string, "-X", 2)) - parse_x_arg (option_string + 2); - else + r = parse_x_arg (option_string + 1); + else if (! strncmp (option_string, "-X", 2)) + r = parse_x_arg (option_string + 2); + + if (r == -1 && ! vm_args->ignoreUnrecognized) { - unknown_option: fprintf (stderr, "libgcj: unknown option: %s\n", option_string); return -1; } } - else - goto unknown_option; } return 0; } |