harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r925435 - in /harmony/enhanced/classlib/branches/java6: ./ depends/libs/ make/ modules/concurrent/src/main/java/java/util/concurrent/atomic/ modules/concurrent/src/main/java/java/util/concurrent/locks/ modules/imageio/src/main/native/jpegen...
Date Fri, 19 Mar 2010 21:29:31 GMT
Author: hindessm
Date: Fri Mar 19 21:29:30 2010
New Revision: 925435

URL: http://svn.apache.org/viewvc?rev=925435&view=rev
Log:
Merge updates from classlib trunk@925192

Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/depends/libs/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
    harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/EpollSelectorImpl.c
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hynlshelpers.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/sound/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/   (props changed)

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-922278
+/harmony/enhanced/classlib/trunk:713674-735919,765923-925192
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/depends/libs:544451-922278
+/harmony/enhanced/classlib/trunk/depends/libs:544451-925192

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-922278
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-922278
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-922278
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-925192

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c Fri Mar 19 21:29:30 2010
@@ -55,7 +55,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
 
 static JNIEnv* get_env() {
     JNIEnv *e;
-    int rt = (*jvm)->GetEnv(jvm, (void **)&e, JNI_VERSION_1_2);
+    (*jvm)->GetEnv(jvm, (void **)&e, JNI_VERSION_1_2);
     return e;
 }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/shared/instrument.c Fri Mar 19 21:29:30 2010
@@ -203,7 +203,6 @@ JNIEXPORT void JNICALL Java_org_apache_h
     jmethodID method_get_data;
     jsize length;
     jvmtiClassDefinition *class_definitions;
-    int i=0;
     jclass clz;
     jmethodID method_clear;
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-922278
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-922278
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-925192

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/cmain.c Fri Mar 19 21:29:30 2010
@@ -43,58 +43,6 @@ extern UDATA VMCALL gpProtectedMain (voi
 extern int main_addVMDirToPath(int argc, char **argv, char **envp); 
 #endif /* HY_NO_THR */
 
-static UDATA VMCALL
-genericSignalHandler (struct HyPortLibrary *portLibrary, U_32 gpType,
-                      void *gpInfo, void *userData)
-{
-  PORT_ACCESS_FROM_PORT (portLibrary);
-  U_32 category;
-
-  hytty_printf (PORTLIB, "\nAn unhandled error (%d) has occurred.\n", gpType);
-
-  for (category = 0; category < HYPORT_SIG_NUM_CATEGORIES; category++)
-    {
-      U_32 infoCount = hysig_info_count (gpInfo, category);
-      U_32 infoKind, index;
-      void *value;
-      const char *name;
-
-      for (index = 0; index < infoCount; index++)
-        {
-          infoKind = hysig_info (gpInfo, category, index, &name, &value);
-
-          switch (infoKind)
-            {
-            case HYPORT_SIG_VALUE_32:
-              hytty_printf (PORTLIB, "%s=%08.8x\n", name, *(U_32 *) value);
-              break;
-            case HYPORT_SIG_VALUE_64:
-            case HYPORT_SIG_VALUE_FLOAT_64:
-              hytty_printf (PORTLIB, "%s=%016.16llx\n", name,
-                            *(U_64 *) value);
-              break;
-            case HYPORT_SIG_VALUE_STRING:
-              hytty_printf (PORTLIB, "%s=%s\n", name, (const char *) value);
-              break;
-            case HYPORT_SIG_VALUE_ADDRESS:
-              hytty_printf (PORTLIB, "%s=%p\n", name, *(void **) value);
-              break;
-            }
-        }
-    }
-
-  abort ();
-
-  /* UNREACHABLE */
-  return 0;
-}
-
-static UDATA VMCALL
-signalProtectedMain (HyPortLibrary * portLibrary, void *arg)
-{
-  return gpProtectedMain (arg);
-}
-
 #ifdef HY_NO_THR
 typedef I_32 (PVMCALL hyport_init_library_type) (struct HyPortLibrary *portLibrary,
 		struct HyPortLibraryVersion *version, 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c Fri Mar 19 21:29:30 2010
@@ -123,8 +123,6 @@ gpProtectedMain (struct haCmdlineOptions
   char *mainClass = NULL;
   char *mainClassAlloc = NULL;
   int isStandaloneJar = 0;
-  int copyrightWritten = 0;
-  int versionWritten = 0;
   UDATA classArg = argc;
   int i;
   char *vmdllsubdir;
@@ -135,7 +133,6 @@ gpProtectedMain (struct haCmdlineOptions
   char *exeBaseName;
   char *endPathPtr;
   UDATA handle;
-  int javaRc = 0;
   char defaultDllName[] = "harmonyvm";
   char defaultDirName[] = "default";
   int rc = -1;
@@ -1185,7 +1182,6 @@ main_runJavaMain (JNIEnv * env, char *ma
   jclass globalCls;
   jarray globalArgs;
 
-  PORT_ACCESS_FROM_PORT (portLibrary);
   slashifiedClassName =
     portLibrary->mem_allocate_memory (portLibrary,
                                       strlen (mainClassName) + 1);
@@ -1542,7 +1538,6 @@ main_addVMDirToPath(int argc, char **arg
 {
   char *vmdllsubdir;
   char *newPathToAdd = NULL;
-  char *propertiesFileName = NULL;
   char *exeName = NULL;
   char *exeBaseName;
   char *endPathPtr;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c Fri Mar 19 21:29:30 2010
@@ -56,10 +56,12 @@
 #include "main_hlp.h"
 
 
+#if !defined(LINUX)
 static BOOLEAN isSymbolicLink (char *filename);
 static IDATA cwdname (char **result);
-static IDATA readSymbolicLink (char *linkFilename, char **result);
 static IDATA searchSystemPath (char *filename, char **result);
+#endif
+static IDATA readSymbolicLink (char *linkFilename, char **result);
 
 
 int
@@ -194,7 +196,6 @@ void *
 main_mem_allocate_memory (int byteAmount)
 {
 	void *pointer = NULL;
-	void *mem;
 	if (byteAmount == 0)
 	{                           /* prevent malloc from failing causing allocate to return null */
 		byteAmount = 1;
@@ -210,6 +211,7 @@ main_mem_free_memory (void *memoryPointe
 }
 
 
+#if !defined(LINUX)
 /**
  * @internal  Examines the named file to determine if it is a symbolic link.  On platforms which don't have
  * symbolic links (or where we can't tell) or if an unexpected error occurs, just answer FALSE.
@@ -262,7 +264,7 @@ doAlloc:
   *result = cwd;
   return 0;
 }
-
+#endif
 
 /**
  * @internal  Attempts to read the contents of a symbolic link.  (The contents are the relative pathname of
@@ -275,8 +277,6 @@ static IDATA
 readSymbolicLink (char *linkFilename,
                   char **result)
 {
-  /* TODO: remove this ifdef and find out what other builds break (if any) */
-#if defined(LINUX)
   char fixedBuffer[PATH_MAX + 1];
   int size = readlink (linkFilename, fixedBuffer, sizeof (fixedBuffer) - 1);
   if (size <= 0)
@@ -291,12 +291,10 @@ readSymbolicLink (char *linkFilename,
     }
   strcpy (*result, fixedBuffer);
   return 0;
-#else
-  return -1;
-#endif
 }
 
 
+#if !defined(LINUX)
 /**
  * @internal  Searches through the system PATH for the named file.  If found, it returns the path entry
  * which matched the file.  A buffer large enough to hold the proper path entry (without a
@@ -368,6 +366,7 @@ searchSystemPath (char *filename, char *
   /* not found */
   return -1;
 }
+#endif
 
 /**
  * Close a shared library.

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c Fri Mar 19 21:29:30 2010
@@ -136,7 +136,7 @@ JNIEXPORT jboolean JNICALL Java_org_apac
 JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_flushImpl
   (JNIEnv * env, jobject thiz, jlong addr, jlong size){
   return msync((void *)((IDATA)addr), size, MS_SYNC);
-};
+}
 
 /*
  * Class:     org_apache_harmony_luni_platform_OSMemory

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c Fri Mar 19 21:29:30 2010
@@ -44,6 +44,8 @@
 #include<netinet/ip_icmp.h>
 #endif /* !ZOS */
 
+#include <string.h>
+
 #include "nethelp.h"
 #include "harmonyglob.h"
 #include "helpers.h"
@@ -370,7 +372,7 @@ Java_org_apache_harmony_luni_platform_OS
   
   /* return both correct and error result, let java code handle	exceptions */
   return result;
-};
+}
 
 
 JNIEXPORT jobject JNICALL
@@ -730,7 +732,7 @@ Java_org_apache_harmony_luni_platform_OS
   jobject* toBeReleasedBuffers;
   jint *noffset;
   jboolean isDirectBuffer = JNI_FALSE;
-  jint result;
+  jint result = 0;
   jclass byteBufferClass;
   struct iovec* vect;
   int i;
@@ -748,26 +750,45 @@ Java_org_apache_harmony_luni_platform_OS
     return 0;
   }
 
-  toBeReleasedBuffers = (jobject*) hymem_allocate_memory(sizeof(jobject) * length);
+  toBeReleasedBuffers =
+    (jobject*) hymem_allocate_memory(sizeof(jobject) * length);
   if (toBeReleasedBuffers == NULL) {
     throwNewOutOfMemoryError(env, "");
-    return 0;
+    goto free_resources;
   }
+  memset(toBeReleasedBuffers, 0, sizeof(jobject)*length);
 
   byteBufferClass = HARMONY_CACHE_GET (env, CLS_java_nio_DirectByteBuffer);
   noffset = (*env)->GetIntArrayElements(env, offset, NULL);
+  if (noffset == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
 
   for (i = 0; i < length; ++i) {
     jint *cts;
+    U_8* base;
     buffer = (*env)->GetObjectArrayElement(env, buffers, i);
     isDirectBuffer = (*env)->IsInstanceOf(env, buffer, byteBufferClass);
     if (isDirectBuffer) {
-      vect[i].iov_base =  (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer) + noffset[i];
+      base =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer);
+      if (base == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
       toBeReleasedBuffers[i] = NULL;
     } else {
-      vect[i].iov_base = (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL) + noffset[i];
+      base =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL);
+      if (base == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
       toBeReleasedBuffers[i] = buffer;
     }
+    vect[i].iov_base = base + noffset[i];
+
     cts = (*env)->GetPrimitiveArrayCritical(env, counts, NULL);
     vect[i].iov_len = cts[i];
     (*env)->ReleasePrimitiveArrayCritical(env, counts, cts, JNI_ABORT);
@@ -776,24 +797,31 @@ Java_org_apache_harmony_luni_platform_OS
 
   result = writev(SOCKET_CAST (socketP), vect, length);
 
-  for (i = 0; i < length; ++i) {
-    if (toBeReleasedBuffers[i] != NULL) {
-      (*env)->ReleaseByteArrayElements(env, toBeReleasedBuffers[i], vect[i].iov_base - noffset[i], JNI_ABORT);
+  if (0 > result) {
+    if (errno != EAGAIN) {
+      throwJavaNetSocketException(env, result);
     }
+    result = 0;
   }
 
-  (*env)->ReleaseIntArrayElements(env, offset, noffset, JNI_ABORT);
+ free_resources:
+  
+  if (toBeReleasedBuffers != NULL) {
+    for (i = 0; i < length; ++i) {
+      if (toBeReleasedBuffers[i] != NULL) {
+        (*env)->ReleaseByteArrayElements(env, toBeReleasedBuffers[i],
+                                         vect[i].iov_base - noffset[i],
+                                         JNI_ABORT);
+      }
+    }
+  }
+
+  if (noffset != NULL) {
+    (*env)->ReleaseIntArrayElements(env, offset, noffset, JNI_ABORT);
+  }
 
   hymem_free_memory(toBeReleasedBuffers);
   hymem_free_memory(vect);
 
-  if (0 > result) {
-      if (errno == EAGAIN) {
-          return 0;
-      }
-    throwJavaNetSocketException(env, result);
-    return (jint) 0;  // Ignored, exception takes precedence
-  }
-
   return (jint) result;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c Fri Mar 19 21:29:30 2010
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <string.h>
 
 #include "vmi.h"
 #include "helpers.h"
@@ -441,10 +442,10 @@ Java_org_apache_harmony_luni_platform_OS
   PORT_ACCESS_FROM_ENV(env);
 
   jobject buffer;
-  jobject* toBeReleasedBuffers;
-  jint *noffset;
+  jobject* toBeReleasedBuffers = NULL;
+  jint *noffset = NULL;
   jboolean isDirectBuffer = JNI_FALSE;
-  jint result;
+  jint result = 0;
   LPWSABUF vect;
   int i;
   jint sentBytes;
@@ -464,26 +465,44 @@ Java_org_apache_harmony_luni_platform_OS
     return 0;
   }
 
-  toBeReleasedBuffers = (jobject*) hymem_allocate_memory(sizeof(jobject) * length);
+  toBeReleasedBuffers =
+    (jobject*) hymem_allocate_memory(sizeof(jobject) * length);
   if (toBeReleasedBuffers == NULL) {
     throwNewOutOfMemoryError(env, "");
-    return 0;
+    goto free_resources;
   }
+  memset(toBeReleasedBuffers, 0, sizeof(jobject)*length);
 
   byteBufferClass = HARMONY_CACHE_GET (env, CLS_java_nio_DirectByteBuffer);
   noffset = (*env)->GetIntArrayElements(env, offsets, NULL);
+  if (noffset == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
 
   for (i = 0; i < length; ++i) {
     jint *cts;
+    U_8* buf;
     buffer = (*env)->GetObjectArrayElement(env, buffers, i);
     isDirectBuffer = (*env)->IsInstanceOf(env, buffer, byteBufferClass);
     if (isDirectBuffer) {
-      vect[i].buf =  (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer) + noffset[i];
+      buf =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer);
+      if (buf == NULL) {
+        throwNewOutOfMemoryError(env, "Failed to get direct buffer address");
+        goto free_resources;
+      }
       toBeReleasedBuffers[i] = NULL;
     } else {
-      vect[i].buf = (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL) + noffset[i];
+      buf =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL);
+      if (buf == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
       toBeReleasedBuffers[i] = buffer;
     }
+    vect[i].buf = buf  + noffset[i];
 
     cts = (*env)->GetPrimitiveArrayCritical(env, counts, NULL);
     vect[i].len = cts[i];
@@ -500,22 +519,31 @@ Java_org_apache_harmony_luni_platform_OS
       result = WSASend(socketP->ipv6, vect, length, &sentBytes, HYSOCK_NOFLAGS, NULL, NULL);
     }
 
-  for (i = 0; i < length; ++i) {
-    if (toBeReleasedBuffers[i] != NULL) {
-      (*env)->ReleaseByteArrayElements(env, toBeReleasedBuffers[i], vect[i].buf - noffset[i], JNI_ABORT);
+  if (SOCKET_ERROR == result) {
+    rc = WSAGetLastError ();
+    throwJavaNetSocketException(env, rc);
+    result = 0;
+  }
+
+  
+ free_resources:
+  
+  if (toBeReleasedBuffers != NULL) {
+    for (i = 0; i < length; ++i) {
+      if (toBeReleasedBuffers[i] != NULL) {
+        (*env)->ReleaseByteArrayElements(env, toBeReleasedBuffers[i],
+                                         vect[i].buf - noffset[i],
+                                         JNI_ABORT);
+      }
     }
   }
 
-  (*env)->ReleaseIntArrayElements(env, offsets, noffset, JNI_ABORT);
+  if (noffset != NULL) {
+    (*env)->ReleaseIntArrayElements(env, offsets, noffset, JNI_ABORT);
+  }
 
   hymem_free_memory(toBeReleasedBuffers);
   hymem_free_memory(vect);
 
-  if (SOCKET_ERROR == result) {
-    rc = WSAGetLastError ();
-    throwJavaNetSocketException(env, rc);
-    return (jint) 0;  // Ignored, exception takes precedence
-  }
-
   return sentBytes;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c Fri Mar 19 21:29:30 2010
@@ -136,7 +136,6 @@ UDATA JNICALL HyVMLSAllocKeys(JNIEnv * e
 	hythread_monitor_enter(globalMonitor);
 
 	if (++(*pInitCount) == 1) {
-		JavaVM *javaVM = NULL;
 		void **pKey;
 		UDATA count = 0;
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-922278
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-925192

Modified: harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ArrayAccessorImpl.c Fri Mar 19 21:29:30 2010
@@ -111,14 +111,14 @@ pinFunctions(Double, jdouble)
     (*env)->ReleasePrimitiveArrayCritical(env, (jarray)array, ptr, 0); \
 }
 
-setGetFunctions(B, jbyte);
-setGetFunctions(Z, jboolean);
-setGetFunctions(S, jshort);
-setGetFunctions(C, jchar);
-setGetFunctions(I, jint);
-setGetFunctions(J, jlong);
-setGetFunctions(F, jfloat);
-setGetFunctions(D, jdouble);
+setGetFunctions(B, jbyte)
+setGetFunctions(Z, jboolean)
+setGetFunctions(S, jshort)
+setGetFunctions(C, jchar)
+setGetFunctions(I, jint)
+setGetFunctions(J, jlong)
+setGetFunctions(F, jfloat)
+setGetFunctions(D, jdouble)
 
 /*
  * Class:     org_apache_harmony_misc_accessors_ArrayAccessor

Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Fri Mar 19 21:29:30 2010
@@ -42,15 +42,6 @@ import org.apache.harmony.luni.platform.
 public class ServerSocketChannelImpl extends ServerSocketChannel implements
         FileDescriptorHandler {
 
-    // status un-init, not initialized.
-    private static final int SERVER_STATUS_UNINIT = -1;
-
-    // status after open and before closed.
-    private static final int SERVER_STATUS_OPEN = 0;
-
-    // status closed.
-    private static final int SERVER_STATUS_CLOSED = 1;
-
     // The fd to interact with native code
     private final FileDescriptor fd;
 
@@ -59,8 +50,6 @@ public class ServerSocketChannelImpl ext
 
     private final SocketImpl impl;
 
-    int status = SERVER_STATUS_UNINIT;
-
     // whether the socket is bound
     boolean isBound = false;
 
@@ -73,7 +62,6 @@ public class ServerSocketChannelImpl ext
      */
     public ServerSocketChannelImpl(SelectorProvider sp) throws IOException {
         super(sp);
-        status = SERVER_STATUS_OPEN;
         fd = new FileDescriptor();
         Platform.getNetworkSystem().createStreamSocket(fd,
                 NetUtil.preferIPv4Stack());
@@ -85,7 +73,6 @@ public class ServerSocketChannelImpl ext
     @SuppressWarnings("unused")
     private ServerSocketChannelImpl() throws IOException {
         super(SelectorProvider.provider());
-        status = SERVER_STATUS_OPEN;
         fd = new FileDescriptor();
         impl = new PlainServerSocketImpl(fd);
         socket = new ServerSocketAdapter(impl, this);
@@ -168,7 +155,6 @@ public class ServerSocketChannelImpl ext
      * @see java.nio.channels.spi.AbstractSelectableChannel#implCloseSelectableChannel()
      */
     synchronized protected void implCloseSelectableChannel() throws IOException {
-        status = SERVER_STATUS_CLOSED;
         if (!socket.isClosed()) {
             socket.close();
         }
@@ -289,7 +275,6 @@ public class ServerSocketChannelImpl ext
                 } else {
                     super.close();
                 }
-                channelImpl.status = SERVER_STATUS_CLOSED;
             }
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/EpollSelectorImpl.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/EpollSelectorImpl.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/EpollSelectorImpl.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/EpollSelectorImpl.c Fri Mar 19 21:29:30 2010
@@ -118,7 +118,6 @@ JNIEXPORT jlong JNICALL Java_org_apache_
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_nio_internal_EpollSelectorImpl_addFileDescriptor
   (JNIEnv * env, jclass clazz, jlong epollfd, jint mode, jint fd) 
 {
-    int op;
     struct epoll_event ev;
     int result;
     

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java Fri Mar 19 21:29:30 2010
@@ -321,11 +321,6 @@ public abstract class Charset implements
      */
     @SuppressWarnings("unchecked")
     public static SortedMap<String, Charset> availableCharsets() {
-        // workaround: conflicted Charsets with icu4j 4.0
-        Charset.forName("TIS-620");
-        Charset.forName("windows-1258");
-        Charset.forName("cp856");
-        Charset.forName("cp922");
         // Initialize the built-in charsets map cache if necessary
         if (null == _builtInCharsets) {
             synchronized (Charset.class) {
@@ -448,7 +443,7 @@ public abstract class Charset implements
         }
         cs = _builtInProvider.charsetForName(charsetName);
         if (null != cs) {
-            cacheCharset(cs);
+            cacheCharset(cs, charsetName);
             return cs;
         }
 
@@ -477,7 +472,7 @@ public abstract class Charset implements
                         e.nextElement());
 				 inForNameInternal = false;
                 if (null != cs) {
-                    cacheCharset(cs);
+                    cacheCharset(cs, charsetName);
                     return cs;
                 }
             }
@@ -492,18 +487,15 @@ public abstract class Charset implements
     /*
      * save charset into cachedCharsetTable
      */
-    private static void cacheCharset(Charset cs) {
-        if (!cachedCharsetTable.containsKey(cs.name())){
-            cachedCharsetTable.put(cs.name(), cs);
-        }
-        Set<String> aliasesSet = cs.aliases();
-        if (null != aliasesSet) {
-            Iterator<String> iter = aliasesSet.iterator();
-            while (iter.hasNext()) {
-                String alias = iter.next();
-                if (!cachedCharsetTable.containsKey(alias)) {
-                    cachedCharsetTable.put(alias, cs);
-                }
+    private static void cacheCharset(Charset cs, String charsetName) {
+        String canonicalName = cs.name();
+        if (!cachedCharsetTable.containsKey(canonicalName)) {
+            cachedCharsetTable.put(canonicalName, cs);
+        }
+
+        if (!canonicalName.equals(charsetName)) {
+            if (!cachedCharsetTable.containsKey(charsetName)) {
+                cachedCharsetTable.put(charsetName, cs);
             }
         }
     }
@@ -554,7 +546,7 @@ public abstract class Charset implements
             }
             cs = _builtInProvider.charsetForName(charsetName);
             if (null != cs) {
-                cacheCharset(cs);
+                cacheCharset(cs, charsetName);
                 return true;
             }
             return false;

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-922278
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-922278
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-922278
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-925192

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c Fri Mar 19 21:29:30 2010
@@ -27,7 +27,9 @@ void
 ioh_convertToPlatform (char *path)
 {
   char *pathIndex;
+#if !(DIR_SEPARATOR == '/')
   size_t length = strlen (path);
+#endif
 
   /* Convert all separators to the same type */
   pathIndex = path;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c Fri Mar 19 21:29:30 2010
@@ -595,7 +595,6 @@ parse_catalogues (struct HyPortLibrary *
   I_32 success_reading = 0;
   HyNLSDataCache *nls = &portLibrary->portGlobals->nls_data;
   HyNLSHashEntry *entry = NULL;
-  char *message = NULL;
   char convertedModuleEnum[5];
   U_32 catalog_index;
   /* calculate a size which is larger than we could possibly need by putting together all of the prefixes and suffixes */
@@ -988,7 +987,6 @@ static void
 free_catalog (struct HyPortLibrary *portLibrary)
 {
   HyNLSDataCache *nls = &portLibrary->portGlobals->nls_data;
-  HyNLSHashEntry *old_hashEntries = nls->old_hashEntries;
   U_32 i;
 #if defined(NLS_DEBUG_TRACE)
   portLibrary->tty_printf (portLibrary, "NLS - free_catalog\n");

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c Fri Mar 19 21:29:30 2010
@@ -183,7 +183,6 @@ hyipcmutex_release (struct HyPortLibrary
 {
   int sid;
   int nsops;                    /* number of operations to perform on semaphore */
-  int nsems = 1;                /* number of semaphores */
   key_t sKey = 439;             /* semaphore identifier key */
   int nameLen;                  /* length of semaphore name */
   char *sPath;                  /* semaphore path (used in ftok) */

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c Fri Mar 19 21:29:30 2010
@@ -58,7 +58,9 @@ void *VMCALL
 hymem_allocate_memory (struct HyPortLibrary *portLibrary, UDATA byteAmount)
 {
   void *pointer = NULL;
+#if defined(DEBUG_MALLOC_FREE_LEAK)
   void *mem;
+#endif
 
   Trc_PRT_mem_hymem_allocate_memory_Entry (byteAmount);
 #if defined(DEBUG_MALLOC_FREE_LEAK)

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hynlshelpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hynlshelpers.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hynlshelpers.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hynlshelpers.c Fri Mar 19 21:29:30 2010
@@ -73,8 +73,6 @@ nls_determine_locale (struct HyPortLibra
 
   IDATA countryStart = 2;
 
-  PORT_ACCESS_FROM_PORT (portLibrary);
-
   /* Get the language */
 
   /* Set locale, returns NULL in case locale data cannot be initialized. This may indicate

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c Fri Mar 19 21:29:30 2010
@@ -87,8 +87,6 @@ static struct hyshmem_handle *createshmH
 static IDATA writeControlFile (HyPortLibrary * portLibrary,
                                const char *filename, I_32 proj_id, key_t key,
                                I_32 size, I_32 shmid);
-static void getControlFileName (struct HyPortLibrary *portLibrary,
-                                char *buffer, UDATA size, const char *name);
 static IDATA openSharedMemory (HyPortLibrary * portLibrary,
                                struct hyshmem_handle **handle,
                                const char *controlFile);
@@ -125,9 +123,6 @@ hyshmem_open (HyPortLibrary * portLibrar
 {
   /*TODO: Do we need the length to be longer? */
   char controlFile[HYSH_MAXPATH];
-  IDATA retryCount, exist;
-  key_t fkey;
-  void *region;
   int retry = RETRY_COUNT;
 
   Trc_PRT_shmem_hyshmem_open_Entry (rootname, size, perm);
@@ -417,7 +412,6 @@ hyshmem_findnext (struct HyPortLibrary *
                   char *resultbuf)
 {
   char file[HyMaxPath];
-  int result;
 
   Trc_PRT_shmem_hyshmem_findnext_Entry (findHandle);
 
@@ -558,7 +552,6 @@ openSharedMemory (HyPortLibrary * portLi
                   const char *controlFile)
 {
   struct hyshmem_controlFileFormat *info;
-  key_t fkey;
   void *region;
   UDATA retryCount = RETRY_COUNT;
   IDATA rc;
@@ -957,36 +950,6 @@ readControlFile (HyPortLibrary * portLib
 
 #undef CDEV_CURRENT_FUNCTION
 
-#define CDEV_CURRENT_FUNCTION getControlFileName
-/**
- * @internal
- * Get the filename for a shared memory area
- *
- * @param[in] portLibrary The port library
- * @param[in] buffer where the base file name will be stored
- * @param[in] size size of the buffer
- * @param[in] name of the shared memory area
- *
- */
-static void
-getControlFileName (struct HyPortLibrary *portLibrary, char *buffer,
-                    UDATA size, const char *name)
-{
-  char versionStr[256];
-
-  GET_VERSION_STRING (portLibrary, versionStr);
-  portLibrary->str_printf (portLibrary, buffer, size, "%s%s%s", versionStr,
-                           HYSH_MEMORY_ID, name);
-
-#if defined(HYSHMEM_DEBUG)
-  portLibrary->tty_printf (portLibrary, "getControlFileName returns: %s\n",
-                           buffer);
-#endif
-
-}
-
-#undef CDEV_CURRENT_FUNCTION
-
 #define CDEV_CURRENT_FUNCTION isControlFileName
 static int
 isControlFileName (struct HyPortLibrary *portLibrary, char *buffer)
@@ -1049,7 +1012,7 @@ getControlFilePath (struct HyPortLibrary
                            HYSH_BASEDIR, versionStr, HYSH_MEMORY_ID, name);
 
 #if defined(HYSHMEM_DEBUG)
-  portLibrary->tty_printf (portLibrary, "getControlFileName returns: %s\n",
+  portLibrary->tty_printf (portLibrary, "getControlFilePath returns: %s\n",
                            buffer);
 #endif
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.c Fri Mar 19 21:29:30 2010
@@ -104,10 +104,7 @@ hyshsem_open (struct HyPortLibrary *port
   /* TODO: needs to be longer? dynamic? */
   char baseFile[HYSH_MAXPATH];
   char versionStr[32];
-  struct stat statbuf;
   I_8 retry = RETRY_COUNT;
-  I_8 exist = 0;
-  I_32 fd;
 
   Trc_PRT_shsem_hyshsem_open_Entry (semname, setSize, permission);
 
@@ -880,7 +877,6 @@ openSemaphore (struct HyPortLibrary *por
   /* base file exist - process the file and get sem info */
   hyshsem_baseFileFormat *info;
   I_8 retrycount = RETRY_COUNT;
-  key_t fkey;
   I_32 rc;
 
   while (retrycount > 0)

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c Fri Mar 19 21:29:30 2010
@@ -958,7 +958,9 @@ hysock_getaddrinfo_address (struct HyPor
   I_32 rc = 0;
   OSADDRINFO *addr;
   void *sock_addr;
+#if !defined(IPv6_FUNCTION_SUPPORT)
   char **addr_list;
+#endif
   int i;
 
   /* If we have the IPv6 functions available we cast to an OSADDRINFO structure otherwise a OSHOSTENET structure */
@@ -1169,7 +1171,9 @@ hysock_getaddrinfo_name (struct HyPortLi
                          hyaddrinfo_t handle, char *name, int index)
 {
   I_32 rc = 0;
+#if !defined(IPv6_FUNCTION_SUPPORT)
   char **alias_list;
+#endif
   int i;
   OSADDRINFO *addr;
 
@@ -1591,8 +1595,6 @@ hysock_getnameinfo (struct HyPortLibrary
 
 /* If we have the IPv6 functions available we will call them, otherwise we'll call the IPv4 function */
 #if defined(IPv6_FUNCTION_SUPPORT)
-  OSSOCKADDR *addr;
-  int size;
   int rc = 0;
   rc =
     getnameinfo ((OSADDR *) & in_addr->addr, sizeof (in_addr->addr), name,
@@ -4950,11 +4952,8 @@ getNextNetlinkMsg (struct HyPortLibrary 
 {
 
 #if (defined(HAS_RTNETLINK))
-  struct sockaddr_nl address;
   U_32 receiveLength;
   struct pollfd my_pollfd;
-  socklen_t addressLength = sizeof (address);
-  int result;
 
   for (;;)
     {
@@ -4999,7 +4998,7 @@ getNextNetlinkMsg (struct HyPortLibrary 
                 int reallocLoop = 1;
 
                 while (reallocLoop) {
-                    int len = recvmsg(netlinkContext->netlinkSocketHandle, &msg, MSG_PEEK);
+                    (void)recvmsg(netlinkContext->netlinkSocketHandle, &msg, MSG_PEEK);
 
                     /*
                      *  if the peek shows that we would truncate, realloc to 2x the buffer size

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/META-INF/MANIFEST.MF?rev=925435&r1=925434&r2=925435&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/META-INF/MANIFEST.MF Fri Mar 19 21:29:30 2010
@@ -22,4 +22,5 @@ Import-Package: java.io,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util
 Export-Package: javax.sound.midi,
- javax.sound.midi.spi
+ javax.sound.midi.spi,
+ javax.sound.sampled

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-922278
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-922278
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-925192

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 19 21:29:30 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-922278
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-925192



Mime
View raw message