[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2805] trunk/LWJGL

[<eli...@us...>]

Revision: 2805
          http://svn.sourceforge.net/java-game-lib/?rev=2805&view=rev
Author:   elias_naur
Date:     2007-04-25 22:58:35 -0700 (Wed, 25 Apr 2007)

Log Message:
-----------
Simplified ALC10.nalcOpenDevice

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2007-04-24 14:41:17 UTC (rev 2804)
+++ trunk/LWJGL/build.xml	2007-04-26 05:58:35 UTC (rev 2805)
@@ -306,7 +306,7 @@
 	<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
 
 	<!-- Create ONLY the jar archives -->
-	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
+	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
 		<move todir="libs/">
 			<fileset dir="${lwjgl.temp}/jar">
 				<include name="*.jar"/>

Modified: trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c	2007-04-24 14:41:17 UTC (rev 2804)
+++ trunk/LWJGL/src/native/common/org_lwjgl_openal_ALC10.c	2007-04-26 05:58:35 UTC (rev 2805)
@@ -139,18 +139,10 @@
 	/* get device */
 	device = alcOpenDevice((ALubyte *) tokenstring);
 
-	/* if error - cleanup and get out */
-	if(device == NULL) {
-		if(tokenstring != NULL) {
-			free(tokenstring);
-		}
-		return (jlong) NULL;
+	if(tokenstring != NULL) {
+		free(tokenstring);
 	}
 
-	/* clean up */
-	if (tokenstring != NULL)
-		free(tokenstring);
-
 	return (jlong)((intptr_t)device);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.