Changeset: 3b66ee2cbc14 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b66ee2cbc14
Modified Files:
monetdb5/mal/mal_module.c
monetdb5/modules/mal/manual.c
Branch: default
Log Message:
Compilation fixes.
diffs (56 lines):
diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c
+++ b/monetdb5/mal/mal_module.c
@@ -109,7 +109,7 @@ void getModuleList(Module** out, int* le
for(i = 0; i < MODULE_HASH_SIZE; i++) {
Module m = moduleIndex[i];
while(m) {
- *out[currentIndex++] = m;
+ (*out)[currentIndex++] = m;
m = m->link;
}
}
@@ -152,11 +152,13 @@ Module newModule(Module scope, str nme){
* The scope can be fixed. This is used by the parser.
* Reading a module often calls for creation first.
*/
-Module fixModule(Module scope, str nme){
+Module fixModule(Module scope, str nme) {
+ Module m;
+
if(strcmp(nme, "user") == 0)
return scope;
- Module m = getModule(nme);
+ m = getModule(nme);
if (m) return m;
return newModule(scope, nme);
@@ -292,9 +294,10 @@ void deleteSymbol(Module scope, Symbol p
*/
Module findModule(Module scope, str name){
Module def = scope;
+ Module m;
if (name == NULL) return scope;
- Module m = getModule(name);
+ m = getModule(name);
if (m) return m;
/* default is always matched with current */
diff --git a/monetdb5/modules/mal/manual.c b/monetdb5/modules/mal/manual.c
--- a/monetdb5/modules/mal/manual.c
+++ b/monetdb5/modules/mal/manual.c
@@ -48,12 +48,7 @@ MANUALcreateOverview(Client cntxt, MalBl
if(com) BBPunfix(com->batCacheid);
}
- if (s == NULL) {
- return MAL_SUCCEED;
- }
-
list[top++] = cntxt->nspace;
-
getModuleList(&moduleList, &length);
while (top < 256 && top <= length) {
list[top] = moduleList[top - 1];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
