Changeset: f8966cfe311c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8966cfe311c
Modified Files:
monetdb5/mal/mal_linker.mx
Branch: Mar2011
Log Message:
MAL: Don't use the handle and filename fields as sentinels. They aren't.
diffs (40 lines):
diff --git a/monetdb5/mal/mal_linker.mx b/monetdb5/mal/mal_linker.mx
--- a/monetdb5/mal/mal_linker.mx
+++ b/monetdb5/mal/mal_linker.mx
@@ -151,9 +151,10 @@
the loading time, while the signatures of the functions are still
obtained from the source-file MAL script.
@c
- for(idx =0; idx < lastfile && filesLoaded[idx].handle; idx++){
+ for (idx =0; idx < lastfile; idx++)
+ if (filesLoaded[idx].handle) {
adr = (MALfcn) dlsym(filesLoaded[idx].handle, fcnname);
- if( adr != NULL) {
+ if (adr != NULL) {
prev = idx;
return adr; /* found it */
}
@@ -200,8 +201,9 @@
{
int idx;
- for (idx = 0; filesLoaded[idx].filename && idx < lastfile; idx++)
- if (strcmp(filesLoaded[idx].filename, modulename) == 0) {
+ for (idx = 0; idx < lastfile; idx++)
+ if (filesLoaded[idx].filename &&
+ strcmp(filesLoaded[idx].filename, modulename) == 0) {
return 1;
}
return 0;
@@ -227,8 +229,9 @@
mode |= RTLD_MEMBER;
#endif
- for (idx = 0; filesLoaded[idx].filename && idx < lastfile; idx++)
- if (strcmp(filesLoaded[idx].filename, filename) == 0)
+ for (idx = 0; idx < lastfile; idx++)
+ if (filesLoaded[idx].filename &&
+ strcmp(filesLoaded[idx].filename, filename) == 0)
/* already loaded */
return MAL_SUCCEED;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
