MonetDB: protocol - Merge again

[Mark Raasveldt]

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

Merge again


diffs (35 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4000,8 +4000,9 @@ static char* mapi_convert_varchar(struct
 }
 
 // classic stackoverflow programming
-static char* itoa(int i, char b[]){
+static void itoa(int i, char b[]){
     char const digit[] = "0123456789";
+    int shifter;
     char* p = b;
     int shifter = i;
     if(i<0){
@@ -4017,7 +4018,6 @@ static char* itoa(int i, char b[]){
         *--p = digit[i%10];
         i = i/10;
     }while(i);
-    return b;
 }
 
 static char* mapi_convert_int(struct MapiColumn *col) {
@@ -4045,9 +4045,11 @@ static char* mapi_convert_tinyint(struct
 }
 
 static char* mapi_convert_double(struct MapiColumn *col) {
+       char *dummy = NULL;
        if (*((double*) col->buffer_ptr) == *((double*)col->null_value)) return 
NULL;
        //sprintf(col->write_buf, "%g", *((double*) col->buffer_ptr));
-       gcvt(*((double*) col->buffer_ptr), 2, col->write_buf);
+       dummy = gcvt(*((double*) col->buffer_ptr), 2, col->write_buf);
+       (void) dummy;
        return (char*) col->write_buf;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list