MonetDB: protocol - I am not good at merging.

[Mark Raasveldt]

Changeset: 43d82b84e718 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43d82b84e718
Modified Files:
        clients/mapilib/mapi.c
        common/stream/stream.c
Branch: protocol
Log Message:

I am not good at merging.


diffs (33 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4002,9 +4002,8 @@ static char* mapi_convert_varchar(struct
 // classic stackoverflow programming
 static void itoa(int i, char b[]){
     char const digit[] = "0123456789";
-    int shifter;
+    int shifter = i;
     char* p = b;
-    int shifter = i;
     if(i<0){
         *p++ = '-';
         i *= -1;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4315,7 +4315,6 @@ bs2_read(stream *ss, void *buf, size_t e
                        ssize_t uncompressed_length = s->bufsiz;
                        size_t m = 0;
                        char *buf = s->buf;
-                       snappy_status ret;
 
                        if (s->comp != COMPRESSION_NONE) {
                                buf = s->compbuf;
@@ -4394,7 +4393,6 @@ bs2_read(stream *ss, void *buf, size_t e
                                ssize_t uncompressed_length = s->bufsiz;
                                size_t m = 0;
                                char *buf = s->buf;
-                               snappy_status ret;
 
                                if (s->comp != COMPRESSION_NONE) {
                                        buf = s->compbuf;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list