perfsonar development work

Author: uros
Date: 2007-03-27 06:49:14 -0400 (Tue, 27 Mar 2007)
New Revision: 2292

Modified:
   trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
Log:
Minor bugfixes

Modified: trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
===================================================================
--- trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c       2007-03-27 
09:53:52 UTC (rev 2291)
+++ trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c       2007-03-27 
10:49:14 UTC (rev 2292)
@@ -274,9 +274,9 @@
         "FILENAME_RANDOM",
         "REGEXP"
 };
-#define getAnonFuncName(x) ((x - UNCHANGED) < 0 || (x - UNCHANGED) > 
sizeof(anonFuncNames) / sizeof(char*)) ? \
+#define getAnonFuncName(x) (x < 0 || x > sizeof(anonFuncNames) / 
sizeof(char*)) ? \
     "UNKNOWN" : \
-    anonFuncNames[x - UNCHANGED]
+    anonFuncNames[x]
 
 /**
  * Throws MAPIException according to the message and errorCode params.
@@ -1399,12 +1399,13 @@
         intPar3 = (*env)->CallIntMethod(env, parObj, intClsIntValue);
 
         /* Additional arguments depend on intPar3 (the anonymization 
function type) */
-        DEBUG_PRINT("%016llx DEBUG: \tParams to the function: 
(proto=%d->%d,field=%d->%d,func=%d->'%s'",
+        DEBUG_PRINT("%016llx DEBUG: \tParams to the function: 
(proto=%d->%d,field=%d->%d,func=%d->%d['%s']",
                (unsigned long long)getCurrentJVMThreadID(env),
                (int)intPar1, getAnonfuncProtoType(intPar1),
                (int)intPar2, getAnonfuncBaseFieldType(intPar2),
-               (int)intPar3, getAnonFuncName((int)intPar3));
-        switch (intPar3) {
+               (int)intPar3, getAnonfuncType((int)intPar3),
+               getAnonFuncName((int)intPar3));
+        switch (getAnonfuncType((int)intPar3)) {
             /* UNCHANGED anonymization function */
             case UNCHANGED:
                 /* No arguments to the function needed */