Update of /cvsroot/monetdb/pathfinder/compiler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20437/compiler
Modified Files:
compile.c main.c oops.c
Log Message:
propagated changes of Thursday Feb 21 2008 - Friday Feb 22 2008
from the XQuery_0-22 branch to the development trunk
Index: oops.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/oops.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- oops.c 29 Jan 2008 16:49:49 -0000 1.26
+++ oops.c 22 Feb 2008 12:46:27 -0000 1.27
@@ -226,7 +226,7 @@
va_list args;
char buf[OOPS_SIZE];
- snprintf (buf, OOPS_SIZE, "at (%u,%u-%u,%u): %s",
+ snprintf (buf, sizeof(buf)-1, "at (%u,%u-%u,%u): %s",
loc.first_row, loc.first_col,
loc.last_row, loc.last_col, msg);
@@ -273,7 +273,7 @@
if (PFstate.quiet)
return;
- snprintf (buf, OOPS_SIZE, "at (%u,%u-%u,%u): %s",
+ snprintf (buf, sizeof(buf)-1, "at (%u,%u-%u,%u): %s",
loc.first_row, loc.first_col,
loc.last_row, loc.last_col, msg);
Index: compile.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/compile.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- compile.c 8 Feb 2008 22:38:18 -0000 1.137
+++ compile.c 22 Feb 2008 12:46:27 -0000 1.138
@@ -222,7 +222,7 @@
*q = 0;
}
if (p) *p = 0;
- snprintf(url, 1024, "http://%s:%d/xrpc/%s";, uri+7, port, p?(p+1):"");
+ snprintf(url, sizeof(url)-1, "http://%s:%d/xrpc/%s";, uri+7, port,
p?(p+1):"");
if (p) *p = '/';
if (q) *q = ':';
} else {
Index: main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/main.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- main.c 15 Feb 2008 16:53:25 -0000 1.99
+++ main.c 22 Feb 2008 12:46:27 -0000 1.100
@@ -529,7 +529,7 @@
sizeof (struct option) - 1,
sizeof (struct option),
cmp_opt)))
- return snprintf (buf, sizeof (opt_buf), t, l->name), buf;
+ return snprintf (buf, sizeof (opt_buf) - 1, t, l->name), buf;
else
return "";
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
