MonetDB: copybinary - Simplify because no more need for prompting

[Joeri van Ruth]

Changeset: adbd643d29dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adbd643d29dc
Modified Files:
        sql/backends/monet5/sql.c
Branch: copybinary
Log Message:

Simplify because no more need for prompting


diffs (50 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3149,9 +3149,8 @@ mvc_import_table_wrap(Client cntxt, MalB
 }
 
 static bool
-read_more(bstream *in, stream *out)
+read_more(bstream *in)
 {
-       (void)out;
        bool success = false;
        do {
                if (bstream_next(in) <= 0)
@@ -3162,7 +3161,7 @@ read_more(bstream *in, stream *out)
 }
 
 static BAT *
-BATattach_bstream(int tt, bstream *in, stream *out, BUN size)
+BATattach_bstream(int tt, bstream *in, BUN size)
 {
        BAT *bn;
        size_t n;
@@ -3173,7 +3172,7 @@ BATattach_bstream(int tt, bstream *in, s
                return NULL;
 
        if (ATOMstorage(tt) < TYPE_str) {
-               while (read_more(in, out)) {
+               while (read_more(in)) {
                        n = (in->len - in->pos) / asz;
                        if (BATextend(bn, bn->batCount + n) != GDK_SUCCEED) {
                                BBPreclaim(bn);
@@ -3198,7 +3197,7 @@ BATattach_bstream(int tt, bstream *in, s
                }
        } else {
                assert(ATOMstorage(tt) == TYPE_str);
-               while (read_more(in, out)) {
+               while (read_more(in)) {
                        int u;
                        for (n = in->pos, u = 0; n < in->len; n++) {
                                int c = in->buf[n];
@@ -3328,7 +3327,7 @@ mvc_bin_import_table_wrap(Client cntxt, 
                                        goto bailout;
                                }
                                set_prompting(rs, PROMPT2, ws);
-                               c = 
BATattach_bstream(col->type.type->localtype, s, ws, cnt);
+                               c = 
BATattach_bstream(col->type.type->localtype, s, cnt);
                                set_prompting(rs, NULL, NULL);
                                if (!c) {
                                        bstream_destroy(s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list