Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2312 - trunk/perfsonar/contrib/mapi-jni/native/src

Subject: perfsonar development work

List archive

perfsonar: r2312 - trunk/perfsonar/contrib/mapi-jni/native/src


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2312 - trunk/perfsonar/contrib/mapi-jni/native/src
  • Date: Fri, 30 Mar 2007 09:18:07 -0400
Author: uros
Date: 2007-03-30 09:18:07 -0400 (Fri, 30 Mar 2007)
New Revision: 2312

Modified:
trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
Log:
Adding support for the new mapi, which changed ANONYMIZATION API

Modified: trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c
===================================================================
--- trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c 2007-03-30
13:16:42 UTC (rev 2311)
+++ trunk/perfsonar/contrib/mapi-jni/native/src/mapijni.c 2007-03-30
13:18:07 UTC (rev 2312)
@@ -74,7 +74,20 @@
};
#define getAnonfuncProtoType(x) ((x < 0 || x > sizeof(anonfuncProtoTypes) /
sizeof(int)) ? \
anonfuncProtoTypes[0] : anonfuncProtoTypes[x])
+
+/* Anonymization function protocol type string representation */
+static char* anonfuncProtoTypeStrs[] = {
+ "IP",
+ "TCP",
+ "UDP",
+ "ICMP",
+ "HTTP",
+ "FTP"
+};
+#define getAnonfuncProtoTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncProtoTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncProtoTypeStrs[x])

+
/* Anonymization function type mapping between MAPI-JNI and MAPI */
static int anonfuncTypes[] = {
UNCHANGED,
@@ -94,7 +107,27 @@
};
#define getAnonfuncType(x) ((x < 0 || x > sizeof(anonfuncTypes) /
sizeof(int)) ? \
anonfuncTypes[0] : anonfuncTypes[x])
-
+
+/* Anonymization function type string representation */
+static char* anonfuncTypeStrs[] = {
+ "UNCHANGED",
+ "MAP",
+ "MAP_DISTRIBUTION",
+ "STRIP",
+ "RANDOM",
+ "HASHED",
+ "PATTERN_FILL",
+ "ZERO",
+ "REPLACE",
+ "PREFIX_PRESERVING",
+ "PREFIX_PRESERVING_MAP",
+ "CHECKSUM_ADJUST",
+ "FILENAME_RANDOM",
+ "REGEXP"
+};
+#define getAnonfuncTypeStrs(x) ((x < 0 || x > sizeof(anonfuncTypeStrs) /
sizeof(char*)) ? \
+ "?" : anonfuncTypeStrs[x])
+
/* Anonymization hash function type mapping between MAPI-JNI and MAPI */
static int anonfuncHashTypes[] = {
ANON_SHA,
@@ -108,6 +141,19 @@
#define getAnonfuncHashType(x) ((x < 0 || x > sizeof(anonfuncHashTypes) /
sizeof(int)) ? \
anonfuncHashTypes[0] : anonfuncHashTypes[x])

+/* Anonymization hash function type string representation */
+static char* anonfuncHashTypeStrs[] = {
+ "ANON_SHA",
+ "ANON_MD5",
+ "ANON_CRC32",
+ "ANON_SHA_2",
+ "ANON_TRIPLEDES",
+ "ANON_AES",
+ "ANON_DES"
+};
+#define getAnonfuncHashTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncHashTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncHashTypeStrs[x])
+
/* Anonymization function padding type mapping between MAPI-JNI and MAPI */
static int anonfuncPaddingTypes[] = {
PAD_WITH_ZERO,
@@ -115,6 +161,14 @@
};
#define getAnonfuncPaddingType(x) ((x < 0 || x >
sizeof(anonfuncPaddingTypes) / sizeof(int)) ? \
anonfuncPaddingTypes[0] : anonfuncPaddingTypes[x])
+
+/* Anonymization function padding type string representation */
+static char* anonfuncPaddingTypeStrs[] = {
+ "PAD_WITH_ZERO",
+ "STRIP_REST"
+};
+#define getAnonfuncPaddingTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncPaddingTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncPaddingTypeStrs[x])

/* Anonymization function base field type mapping between MAPI-JNI and MAPI
*/
static int anonfuncBaseFieldTypes[] = {
@@ -241,6 +295,131 @@
#define getAnonfuncBaseFieldType(x) ((x < 0 || x >
sizeof(anonfuncBaseFieldTypes) / sizeof(int)) ? \
anonfuncBaseFieldTypes[0] : anonfuncBaseFieldTypes[x])

+/* Anonymization function base field type string representation */
+static char* anonfuncBaseFieldTypeStrs[] = {
+ "PAYLOAD",
+ "CHECKSUM",
+ "SRC_IP",
+ "DST_IP",
+ "TTL",
+ "TOS",
+ "ID",
+ "FIELD_VERSION",
+ "OPTIONS",
+ "PACKET_LENGTH",
+ "IP_PROTO",
+ "IHL",
+ "FRAGMENT_OFFSET",
+ "SRC_PORT",
+ "DST_PORT",
+ "SEQUENCE_NUMBER",
+ "OFFSET_AND_RESERVED",
+ "ACK_NUMBER",
+ "FLAGS",
+ "URGENT_POINTER",
+ "WINDOW",
+ "TCP_OPTIONS",
+ "UDP_DATAGRAM_LENGTH",
+ "TYPE",
+ "CODE",
+ "HTTP_VERSION",
+ "METHOD",
+ "URI",
+ "USER_AGENT",
+ "ACCEPT",
+ "ACCEPT_CHARSET",
+ "ACCEPT_ENCODING",
+ "ACCEPT_LANGUAGE",
+ "ACCEPT_RANGES",
+ "AGE",
+ "ALLOW",
+ "AUTHORIZATION",
+ "CACHE_CONTROL",
+ "CONNECTION_TYPE",
+ "CONTENT_TYPE",
+ "CONTENT_LENGTH",
+ "CONTENT_LOCATION",
+ "CONTENT_MD5",
+ "CONTENT_RANGE",
+ "COOKIE",
+ "ETAG",
+ "EXPECT",
+ "EXPIRES",
+ "FROM",
+ "HOST",
+ "IF_MATCH",
+ "IF_MODIFIED_SINCE",
+ "IF_NONE_MATCH",
+ "IF_RANGE",
+ "IF_UNMODIFIED_SINCE",
+ "LAST_MODIFIED",
+ "MAX_FORWRDS",
+ "PRAGMA",
+ "PROXY_AUTHENTICATE",
+ "PROXY_AUTHORIZATION",
+ "RANGE",
+ "REFERRER",
+ "RETRY_AFTER",
+ "SET_COOKIE",
+ "SERVER",
+ "TE",
+ "TRAILER",
+ "TRANSFER_ENCODING",
+ "UPGRADE",
+ "VIA",
+ "WARNING",
+ "WWW_AUTHENTICATE",
+ "X_POWERED_BY",
+ "RESPONSE_CODE",
+ "RESP_CODE_DESCR",
+ "VARY",
+ "DATE",
+ "CONTENT_ENCODING",
+ "KEEP_ALIVE",
+ "LOCATION",
+ "CONTENT_LANGUAGE",
+ "DERIVED_FROM",
+ "ALLOWED",
+ "MIME_VERSION",
+ "TITLE",
+ "REFRESH",
+ "HTTP_PAYLOAD",
+ "USER",
+ "PASS",
+ "ACCT",
+ "FTP_TYPE",
+ "STRU",
+ "MODE",
+ "CWD",
+ "PWD",
+ "CDUP",
+ "PASV",
+ "RETR",
+ "REST",
+ "PORT",
+ "LIST",
+ "NLST",
+ "QUIT",
+ "SYST",
+ "STAT",
+ "HELP",
+ "NOOP",
+ "STOR",
+ "APPE",
+ "STOU",
+ "ALLO",
+ "MKD",
+ "RMD",
+ "DELE",
+ "RNFR",
+ "RNTO",
+ "SITE",
+ "FTP_RESPONSE_CODE",
+ "FTP_RESPONSE_ARG"
+};
+#define getAnonfuncBaseFieldTypeStrs(x) ((x < 0 || x >
sizeof(anonfuncBaseFieldTypeStrs) / sizeof(char*)) ? \
+ "?" : anonfuncBaseFieldTypeStrs[x])
+
/* Anonymization function pattern type mapping between MAPI-JNI and MAPI */
static int anonfuncPatternTypes[] = {
INTEGER,
@@ -257,26 +436,6 @@
#define getAnonfuncMapDistrType(x) ((x < 0 || x >
sizeof(anonfuncMapDistrTypes) / sizeof(int)) ? \
anonfuncMapDistrTypes[0] : anonfuncMapDistrTypes[x])

-/* Mapping between anonymization function and it's name */
-static const char* anonFuncNames[] = {
- "UNCHANGED",
- "MAP",
- "MAP_DISTRIBUTION",
- "STRIP",
- "RANDOM",
- "HASHED",
- "PATTERN_FILL",
- "ZERO",
- "REPLACE",
- "PREFIX_PRESERVING",
- "PREFIX_PRESERVING_MAP",
- "CHECKSUM_ADJUST",
- "FILENAME_RANDOM",
- "REGEXP"
-};
-#define getAnonFuncName(x) (x < 0 || x > sizeof(anonFuncNames) /
sizeof(char*)) ? \
- "UNKNOWN" : \
- anonFuncNames[x]

/**
* Throws MAPIException according to the message and errorCode params.
@@ -589,6 +748,9 @@
int strVecSize = 0;
jstring* strVec = 0;
const char** chrPtrStrVec = 0;
+ char* anonParams = 0;
+ int len;
+ char c;
int i;

/* Initialize some classes and their method IDs */
@@ -1404,7 +1566,8 @@
(int)intPar1, getAnonfuncProtoType(intPar1),
(int)intPar2, getAnonfuncBaseFieldType(intPar2),
(int)intPar3, getAnonfuncType((int)intPar3),
- getAnonFuncName((int)intPar3));
+ getAnonfuncTypeStrs((int)intPar3));
+ printf("%s\n", getAnonfuncProtoTypeStrs(0));
switch (getAnonfuncType((int)intPar3)) {
/* UNCHANGED anonymization function */
case UNCHANGED:
@@ -1438,11 +1601,19 @@
case MAP:
/* No arguments to the function needed */

+ /* Create buffer holding additional params to the function */
+ len = snprintf(&c, 1, "%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3));
+ anonParams = malloc(len + 1);
+ snprintf(anonParams, len + 1, "%s,%s,%s",
+ getAnonfuncProtoTypeStrs(intPar1),
+ getAnonfuncBaseFieldTypeStrs(intPar2),
+ getAnonfuncTypeStrs(intPar3));
/* Call the MAPI function */
fid = mapi_apply_function((int)fd, (char*)chrPtrFunc,
- getAnonfuncProtoType(intPar1),
- getAnonfuncBaseFieldType(intPar2),
- getAnonfuncType(intPar3));
+ anonParams);
break;

/* MAP_DISTRIBUTION anonymization function */
@@ -1458,7 +1629,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1470,7 +1641,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null distribution type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1480,7 +1651,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer distribution type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1492,7 +1663,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid distribution type (%d) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (int)intPar4,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
(int)intPar4, (unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1504,7 +1675,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "left edge of the range" : "median"),
+ getAnonfuncTypeStrs((int)intPar3),
((int)intPar4 == UNIFORM ? "left edge of the range" : "median"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
@@ -1515,7 +1686,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4
== UNIFORM ? "left edge of the range" : "median"),
+ getAnonfuncTypeStrs((int)intPar3),
((int)intPar4 == UNIFORM ? "left edge of the range" : "median"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
@@ -1529,7 +1700,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "right edge of the range" : "standard deviation"),
+ getAnonfuncTypeStrs((int)intPar3),
((int)intPar4 == UNIFORM ? "right edge of the range" : "standard deviation"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
@@ -1540,7 +1711,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer %s argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), ((int)intPar4 ==
UNIFORM ? "right edge of the range" : "standard deviation"),
+ getAnonfuncTypeStrs((int)intPar3),
((int)intPar4 == UNIFORM ? "right edge of the range" : "standard deviation"),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
@@ -1568,7 +1739,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1580,7 +1751,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null number of bytes to be kept argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1590,7 +1761,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer number of bytes to be kept argument [" __FILE__
":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1614,7 +1785,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1626,7 +1797,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null hash function argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1636,7 +1807,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer hash function argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1651,7 +1822,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null padding type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1661,7 +1832,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer padding type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1685,7 +1856,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1697,7 +1868,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1707,7 +1878,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer pattern type argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1722,7 +1893,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1734,7 +1905,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String pattern argument [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1756,7 +1927,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non Integer pattern argument [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1781,7 +1952,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1793,7 +1964,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1803,7 +1974,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String pattern argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1829,7 +2000,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with invalid number of args (%u) [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), paramsSize,
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), paramsSize,
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1841,7 +2012,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with null regex argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1851,7 +2022,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String regex argument [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1871,7 +2042,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s) out
of memory while creating vector [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1881,7 +2052,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s) out
of memory while creating vector [" __FILE__ ":%lu]",
(unsigned long long)getCurrentJVMThreadID(env),
chrPtrFunc,
- getAnonFuncName((int)intPar3), (unsigned
long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (unsigned
long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1900,7 +2071,7 @@
snprintf(errbuf, sizeof(errbuf),
"%016llx MAPI function '%s' (anonfunc=%s)
called with non String regex replacement argument #%d [" __FILE__ ":%lu]",
(unsigned long
long)getCurrentJVMThreadID(env), chrPtrFunc,
- getAnonFuncName((int)intPar3), (i - 4),
(unsigned long)__LINE__);
+ getAnonfuncTypeStrs((int)intPar3), (i - 4),
(unsigned long)__LINE__);
throwMAPIException(env, errbuf, -1);
goto cleanup;
}
@@ -1951,6 +2122,7 @@
if (strVec) free(strVec);
if (chrPtrStrVec) free(chrPtrStrVec);
if (chrPtrFunc) (*env)->ReleaseStringUTFChars(env, funct, chrPtrFunc);
+ if (anonParams) free(anonParams);

return (jint)fid;
}


  • perfsonar: r2312 - trunk/perfsonar/contrib/mapi-jni/native/src, svnlog, 03/30/2007

Archive powered by MHonArc 2.6.16.

Top of Page