MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 71fccca20a3a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71fccca20a3a
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (54 lines):

diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -335,13 +335,13 @@ TABLET_error(stream *s)
        return -1;
 }
 
-/* The output line is first build before being sent. It solves a problem
+/* The output line is first built before being sent. It solves a problem
    with UDP, where you may loose most of the information using short writes
 */
 static inline int
 output_line(char **buf, int *len, char **localbuf, int *locallen, Column *fmt, 
stream *fd, BUN nr_attrs, ptr id)
 {
-       BUN i = 0;
+       BUN i;
        int fill = 0;
 
        for (i = 0; i < nr_attrs; i++) {
@@ -368,9 +368,9 @@ output_line(char **buf, int *len, char *
                                        l = f->tostr(f->extra, localbuf, 
locallen, f->adt, p);
                                        p = *localbuf;
                                }
-                               if (fill + l + f->seplen > *len) {
+                               if (fill + l + f->seplen >= *len) {
                                        /* extend the buffer */
-                                       *buf = (char *) GDKrealloc(*buf, fill + 
l + f->seplen + BUFSIZ);
+                                       *buf = GDKrealloc(*buf, fill + l + 
f->seplen + BUFSIZ);
                                        *len = fill + l + f->seplen + BUFSIZ;
                                        if (*buf == NULL)
                                                return -1;
@@ -395,10 +395,11 @@ output_line_dense(char **buf, int *len, 
 
        for (i = 0; i < nr_attrs; i++) {
                Column *f = fmt + i;
+               char *p;
+               int l;
 
                if (f->c[0]) {
-                       char *p = BUNtail(f->ci[0], f->p);
-                       int l;
+                       p = BUNtail(f->ci[0], f->p);
 
                        if (!p || ATOMcmp(f->adt, ATOMnilptr(f->adt), p) == 0) {
                                p = f->nullstr;
@@ -409,7 +410,7 @@ output_line_dense(char **buf, int *len, 
                        }
                        if (fill + l + f->seplen >= *len) {
                                /* extend the buffer */
-                               *buf = (char *) GDKrealloc(*buf, fill + l + 
f->seplen + BUFSIZ);
+                               *buf = GDKrealloc(*buf, fill + l + f->seplen + 
BUFSIZ);
                                *len = fill + l + f->seplen + BUFSIZ;
                                if (*buf == NULL)
                                        return -1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list