[Monetdb-pf-checkins] pathfinder/compiler compile.c, xquery-decomposition, 1.130.2.2, 1.130.2.3 main.c, xquery-decomposition, 1.97.2.2, 1.97.2.3 oops.c, xquery-decomposition, 1.25.2.1, 1.25.2.2

[Sjoerd Mullender]

Update of /cvsroot/monetdb/pathfinder/compiler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18847/compiler

Modified Files:
      Tag: xquery-decomposition
        compile.c main.c oops.c 
Log Message:
propagated changes of Thursday Feb 21 2008 - Friday Feb 22 2008
from the development trunk to the xquery-decomposition branch


Index: oops.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/oops.c,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- oops.c      30 Jan 2008 10:58:20 -0000      1.25.2.1
+++ oops.c      22 Feb 2008 13:26:01 -0000      1.25.2.2
@@ -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.130.2.2
retrieving revision 1.130.2.3
diff -u -d -r1.130.2.2 -r1.130.2.3
--- compile.c   8 Feb 2008 22:59:11 -0000       1.130.2.2
+++ compile.c   22 Feb 2008 13:26:00 -0000      1.130.2.3
@@ -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.97.2.2
retrieving revision 1.97.2.3
diff -u -d -r1.97.2.2 -r1.97.2.3
--- main.c      16 Feb 2008 01:02:05 -0000      1.97.2.2
+++ main.c      22 Feb 2008 13:26:01 -0000      1.97.2.3
@@ -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
Monetdb-pf-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins