Author: mdonoughe
Date: 2006-06-08 21:14:02 -0700 (Thu, 08 Jun 2006)
New Revision: 2991
Modified:
freeway/native/org_gnu_freeway_server_CPluginLoader.c
freeway/native/switch-table.c
freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
Log:
changed modulePtr to moduleFptrStruct where appropriate
Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-06-09
03:54:46 UTC (rev 2990)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c 2006-06-09
04:14:02 UTC (rev 2991)
@@ -342,7 +342,7 @@
FREE(m);
goto ULE;
}
- m->modulePtr = fptr;
+ m->moduleFptrStruct = fptr;
(*env)->ReleaseStringUTFChars(env, serviceName, strServiceName);
return (jlong) (long) m;
ULE:
Modified: freeway/native/switch-table.c
===================================================================
--- freeway/native/switch-table.c 2006-06-09 03:54:46 UTC (rev 2990)
+++ freeway/native/switch-table.c 2006-06-09 04:14:02 UTC (rev 2991)
@@ -12,7 +12,7 @@
switch (functionType) {
case 13: {
void * carg0 = convObjectToPtr(jargs[0], env);
- int cret = ((FunctionType13)
((void**)m->modulePtr)[functionOffset])(carg0);
+ int cret = ((FunctionType13)
((void**)m->moduleFptrStruct)[functionOffset])(carg0);
updateObjectFromPtr(jargs[0], carg0, env);
oret = convIntToCInt(cret, env);
break;
@@ -20,20 +20,20 @@
case 60: {
int carg0 = convCIntToInt(jargs[0], env);
long long carg1 = convCLongToLong(jargs[1], env);
- ((FunctionType60) ((void**)m->modulePtr)[functionOffset])(carg0, carg1);
+ ((FunctionType60) ((void**)m->moduleFptrStruct)[functionOffset])(carg0,
carg1);
break;
}
case 42: {
int carg0 = convCIntToInt(jargs[0], env);
int carg1 = convCIntToInt(jargs[1], env);
- ((FunctionType42) ((void**)m->modulePtr)[functionOffset])(carg0, carg1);
+ ((FunctionType42) ((void**)m->moduleFptrStruct)[functionOffset])(carg0,
carg1);
break;
}
case 10: {
int carg0 = convCIntToInt(jargs[0], env);
//Please check this out
fprintf(stderr, "This is important for some reason: %x %d %x\n", m->modulePtr,
functionOffset, carg0);
- long long cret = ((FunctionType10)
((void**)m->modulePtr)[functionOffset])(carg0);
+ long long cret = ((FunctionType10)
((void**)m->moduleFptrStruct)[functionOffset])(carg0);
oret = convLongToCLong(cret, env);
break;
}
Modified: freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
2006-06-09 03:54:46 UTC (rev 2990)
+++ freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
2006-06-09 04:14:02 UTC (rev 2991)
@@ -429,7 +429,7 @@
public static void writeSwitch(int functionType, Writer writer) throws
IOException {
int returnType = functionType % CWrapper.MAX_KIND;
StringBuffer preBuffer = new StringBuffer(" case " +
functionType + ": {\n");
- StringBuffer callBuffer = new StringBuffer(" ((FunctionType"
+ functionType + ") ((void**)m->modulePtr)[functionOffset])(");
+ StringBuffer callBuffer = new StringBuffer(" ((FunctionType"
+ functionType + ") ((void**)m->moduleFptrStruct)[functionOffset])(");
StringBuffer postBuffer = new StringBuffer(" break;\n }\n");
functionType = (functionType - returnType) / CWrapper.MAX_KIND;
//a - the current position(base MAX_KIND)
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
