Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11730/src/modules/mal
Modified Files:
language.mx
Log Message:
removed setCwd as cwd is a global thing (set only once)...
Also cwd is removed from the client record
Index: language.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/language.mx,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- language.mx 21 Aug 2007 12:35:42 -0000 1.62
+++ language.mx 6 Nov 2007 23:26:48 -0000 1.63
@@ -145,7 +145,6 @@
language_export str CMDcallBAT(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
language_export str CMDincludeFile(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
language_export str CMDdebug(int *ret, int *flg);
-language_export str CMDsetCwd(str *ret, str *fnme);
language_export str MALassertTriple(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
language_export str MALsafeguardStack(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
#endif /* _LANGUAGE_H */
@@ -299,12 +298,12 @@
(void) ret; /* fool compiler */
if (s == 0)
- throw(MAL, "mal.setCwd", "File name missing\n");
+ throw(MAL, "mal.evalFile", "File name missing\n");
if (*s != '/') {
- char *buf = GDKmalloc(strlen(c->cwd) + strlen(s) + 2);
+ char *buf = GDKmalloc(strlen(monet_cwd) + strlen(s) + 2);
- strcpy(buf, c->cwd);
+ strcpy(buf, monet_cwd);
strcat(buf, "/");
strcat(buf, s);
msg = evalFile(c, buf, 0);
@@ -345,16 +344,6 @@
return MAL_SUCCEED;
}
-str
-CMDsetCwd(str *ret, str *fnme)
-{
- Client c = MCgetClient();
-
- *ret = c->cwd;
- c->cwd = GDKstrdup(*fnme);
- return MAL_SUCCEED;
-}
-
@+ MAL iterator code
This module contains the framework for the construction of iterators.
Iterators enumerate elements in a collection defined by a few parameters,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
