MonetDB: protocol - more compilation fixes

[Hannes Muehleisen]

Changeset: ddde0b605379 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddde0b605379
Modified Files:
        clients/mapilib/mapi.c
        sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

more compilation fixes


diffs (55 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4000,14 +4000,16 @@ 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;
+
     if(i<0){
         *p++ = '-';
         i *= -1;
     }
-    int shifter = i;
+    shifter = i;
     do{ //Move to where representation ends
         ++p;
         shifter = shifter/10;
@@ -4017,7 +4019,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 +4046,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;
 }
 
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1967,7 +1967,7 @@ static int mvc_export_resultset_prot10(r
                switch(ATOMstorage(mtype)) {
                        case TYPE_str:
                                retval = 1;
-                               for(j = 0; j < nil_len; j++) {
+                               for(j = 0; j < (size_t) nil_len; j++) {
                                        retval = retval && mnstr_writeBte(s, 
str_nil[j]);
                                }
                                break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list