ProcAddressEmitter: Remove 'guessing' argument names from types, since they are ambiguous - better use default generic ones to avoid confusion.

2 files changed, 2 insertions, 18 deletions

diff --git a/src/java/com/jogamp/gluegen/MethodBinding.java b/src/java/com/jogamp/gluegen/MethodBinding.java
index a8d4b30..8c2bd9e 100644
--- a/src/java/com/jogamp/gluegen/MethodBinding.java
+++ b/src/java/com/jogamp/gluegen/MethodBinding.java
@@ -157,8 +157,8 @@ public class MethodBinding {
     are no namespace clashes with these fabricated argument
     names. */
     public String getArgumentName(int i) {
-        String ret = sym.getArgumentName(i);
-        if (ret != null) {
+        final String ret = sym.getArgumentName(i);
+        if ( null != ret ) {
             return ret;
         }
         return "arg" + i;
diff --git a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
index fe4c5e2..ba884d0 100755
--- a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
+++ b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
@@ -55,7 +55,6 @@ import com.jogamp.gluegen.JavaEmitter;
 import com.jogamp.gluegen.JavaMethodBindingEmitter;
 import com.jogamp.gluegen.MethodBinding;
 import com.jogamp.gluegen.cgram.types.FunctionSymbol;
-import com.jogamp.gluegen.cgram.types.FunctionType;
 import com.jogamp.gluegen.cgram.types.Type;
 import com.jogamp.gluegen.cgram.types.TypeDictionary;
 import com.jogamp.gluegen.runtime.FunctionAddressResolver;
@@ -272,21 +271,6 @@ public class ProcAddressEmitter extends JavaEmitter {
             shouldWrap = true;
         }
 
-        if (shouldWrap) {
-            // Hoist argument names from function pointer if not supplied in prototype
-            Type funcPointerType = typedefDictionary.get(funcPointerTypedefName);
-            if (funcPointerType != null) {
-                FunctionType typedef = funcPointerType.asPointer().getTargetType().asFunction();
-                FunctionType fun = sym.getType();
-                int numarg = typedef.getNumArguments();
-                for (int i = 0; i < numarg; i++) {
-                    if (fun.getArgumentName(i) == null) {
-                        fun.setArgumentName(i, typedef.getArgumentName(i));
-                    }
-                }
-            }
-        }
-
         return shouldWrap;
     }