Update of /cvsroot/monetdb/MonetDB4/src/monet
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11995/src/monet
Modified Files:
Tag: GDK-2
monet_parse.mx monet_tbl.mx
Log Message:
propagated changes of Monday Sep 03 2007 - Thursday Sep 06 2007
from the development trunk to the GDK-2 branch
Index: monet_parse.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_parse.mx,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- monet_parse.mx 30 Mar 2007 18:02:28 -0000 1.5
+++ monet_parse.mx 6 Sep 2007 13:50:26 -0000 1.5.4.1
@@ -82,6 +82,8 @@
}
}
+#define ECHO /* empty -- don't echo anything (we shouldn't get there anyway
*/
+
#define RETURN(Y) \
do { \
ll_lastval = Y; \
Index: monet_tbl.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/monet/monet_tbl.mx,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -u -d -r1.8.4.2 -r1.8.4.3
--- monet_tbl.mx 6 Aug 2007 21:31:03 -0000 1.8.4.2
+++ monet_tbl.mx 6 Sep 2007 13:50:26 -0000 1.8.4.3
@@ -1408,20 +1408,23 @@
restart. By keeping the reference count at one we are assured that
they remain fixed in memory for the duration of the session.
@c
-static void tbl_rename(Client client, BAT* b, str nme)
+static void
+tbl_rename(Client client, BAT* b, str nme)
{
/* the batname is prefixed with the client user name to make in easy to
spot
* in the BBP dir list. Note that this rename may fail if such a bat
already
* exists (very rare and contrived though)
*/
char buf[256];
+
strncpy(buf, client->user ? client->user : "monet", 128);
if (client->stk) {
- int len = strlen(buf);
- snprintf(buf+len, 256-len, "_%d", client->stk);
+ size_t len = strlen(buf);
+
+ snprintf(buf + len, sizeof(buf) - len, "_%d", client->stk);
}
- strncat(buf, "_", 256);
- strncat(buf, nme, 256);
+ strncat(buf, "_", sizeof(buf) - 1);
+ strncat(buf, nme, sizeof(buf) - 1);
BBPrename(b->batCacheid, buf);
}
-------------------------------------------------------------------------
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
