diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-01-17 18:09:40 +0000 |
| commit | 2127637945ea6b763966398130e0770fa993c860 (patch) | |
| tree | c976ca91e3ef0bda3b34b37c0195145638d8d08e /libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c | |
| parent | bcb36c3e02e3bd2843aad1b9888513dfb5d6e337 (diff) | |
Imported GNU Classpath 0.20
Imported GNU Classpath 0.20
* Makefile.am (AM_CPPFLAGS): Add classpath/include.
* java/nio/charset/spi/CharsetProvider.java: New override file.
* java/security/Security.java: Likewise.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r109831
Diffstat (limited to 'libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c')
| -rw-r--r-- | libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c index 0ba00d1c3c6..86ac06e6f79 100644 --- a/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c +++ b/libjava/classpath/native/jni/java-net/java_net_VMInetAddress.c @@ -1,5 +1,5 @@ /* VMInetAddress.c - Native methods for InetAddress class - Copyright (C) 1998, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,6 @@ exception statement from your version. */ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <assert.h> #include <jni.h> #include <jcl.h> @@ -69,9 +68,6 @@ Java_java_net_VMInetAddress_getLocalHostname (JNIEnv * env, int result; jstring retval; - assert (env != NULL); - assert ((*env) != NULL); - #ifndef WITHOUT_NETWORK TARGET_NATIVE_NETWORK_GET_HOSTNAME (hostname, sizeof (hostname), result); if (result != TARGET_NATIVE_OK) @@ -100,9 +96,6 @@ Java_java_net_VMInetAddress_lookupInaddrAny (JNIEnv * env, jarray IParray; jbyte *octets; - assert (env != NULL); - assert ((*env) != NULL); - /* Allocate an array for the IP address */ IParray = (*env)->NewByteArray (env, 4); if (IParray == NULL) @@ -150,9 +143,6 @@ Java_java_net_VMInetAddress_getHostByAddr (JNIEnv * env, int result; jstring retval; - assert (env != NULL); - assert ((*env) != NULL); - /* Grab the byte[] array with the IP out of the input data */ len = (*env)->GetArrayLength (env, arr); if (len != 4) @@ -215,9 +205,6 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env, jarray ret_octets; int max_addresses; - assert (env != NULL); - assert ((*env) != NULL); - /* Grab the hostname string */ hostname = (*env)->GetStringUTFChars (env, host, 0); if (!hostname) |