MonetDB: default - Fix signature warnings

[Martin Kersten]

Changeset: 22b36efb9956 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22b36efb9956
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/mal_io.c
        monetdb5/modules/mal/mal_io.h
Branch: default
Log Message:

Fix signature warnings


diffs (71 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1255,8 +1255,8 @@ str INSPECTgetkind(Client cntxt, MalBlkP
 str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
p);
 str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str IOexport(bit *ret, bat *bid, str *fnme);
-str IOimport(bat *ret, bat *bid, str *fnme);
+str IOexport(void *ret, bat *bid, str *fnme);
+str IOimport(void *ret, bat *bid, str *fnme);
 str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1926,7 +1926,6 @@ str TRNsubcommit(bit *ret, bat *bid);
 str TRNtrans_abort(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str TRNtrans_clean(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str TRNtrans_commit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str TRNtrans_prev(bat *ret, bat *bid);
 int TYPE_blob;
 int TYPE_date;
 int TYPE_daytime;
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -585,12 +585,12 @@ IOtable(Client cntxt, MalBlkPtr mb, MalS
  */
 
 str
-IOexport(bit *ret, bat *bid, str *fnme)
+IOexport(void *ret, bat *bid, str *fnme)
 {
        BAT *b;
        stream *s;
 
-       *ret = FALSE;
+       (void) ret;
        if ((b = BATdescriptor(*bid)) == NULL) 
                throw(MAL, "io.export", RUNTIME_OBJECT_MISSING);
        
@@ -607,7 +607,6 @@ IOexport(bit *ret, bat *bid, str *fnme)
     BATprintcolumns(s, 1, &b);
        mnstr_close(s);
        mnstr_destroy(s);
-       *ret = TRUE;
        BBPunfix(b->batCacheid);
        return MAL_SUCCEED;
 }
@@ -616,7 +615,7 @@ IOexport(bit *ret, bat *bid, str *fnme)
  * The import command reads a single BAT from an ASCII file produced by export.
  */
 str
-IOimport(int *ret, bat *bid, str *fnme)
+IOimport(void *ret, bat *bid, str *fnme)
 {
        BAT *b;
        int (*tconvert) (const char *, int *, ptr *);
diff --git a/monetdb5/modules/mal/mal_io.h b/monetdb5/modules/mal/mal_io.h
--- a/monetdb5/modules/mal/mal_io.h
+++ b/monetdb5/modules/mal/mal_io.h
@@ -33,8 +33,8 @@ io_export str IOprint_val(Client cntxt, 
 io_export str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 io_export str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 io_export str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-io_export str IOexport(bit *ret, bat *bid, str *fnme);
-io_export str IOimport(int *ret, bat *bid, str *fnme);
+io_export str IOexport(void *ret, bat *bid, str *fnme);
+io_export str IOimport(void *ret, bat *bid, str *fnme);
 io_export str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 io_export str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 io_export str io_stderr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list