Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15256/src/backends/monet5/merovingian
Modified Files:
utils.c
Log Message:
propagated changes of Monday Oct 26 2009 - Thursday Oct 29 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/26 - mr-meltdown: src/backends/monet5/merovingian/utils.c,1.13.2.3
Make sure we don't overwrite our weeks if we had them
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: utils.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/utils.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- utils.c 9 Oct 2009 15:42:49 -0000 1.15
+++ utils.c 29 Oct 2009 08:43:09 -0000 1.16
@@ -210,7 +210,7 @@
p = 1 * 60 * 60 * 24 * 7;
if (t > p) {
- i += sprintf(buf, "%dw", (int)(t / p));
+ i += sprintf(buf + i, "%dw", (int)(t / p));
t -= (t / p) * p;
if (--longness == 0)
return;
@@ -218,7 +218,7 @@
}
p /= 7;
if (t > p) {
- i += sprintf(buf, "%dd", (int)(t / p));
+ i += sprintf(buf + i, "%dd", (int)(t / p));
t -= (t / p) * p;
if (--longness == 0)
return;
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
