MonetDB: trails - Compilation fixes

[Pedro Ferreira]

Changeset: d6db64bc35cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6db64bc35cd
Modified Files:
        sql/backends/monet5/sql_cat.c
        sql/backends/monet5/sql_cquery.c
        sql/backends/monet5/sql_cquery.h
Branch: trails
Log Message:

Compilation fixes


diffs (53 lines):

diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -183,7 +183,7 @@ alter_stream_table(mvc *sql, char *sname
 {
        sql_schema *s = mvc_bind_schema(sql, sname);
        sql_table *t = NULL;
-       char* opname;
+       char* opname = NULL;
 
        if (s)
                t = mvc_bind_table(sql, s, tname);
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -50,7 +50,7 @@
 #include "mal_builder.h"
 #include "opt_prelude.h"
 
-extern void (*cq_close)(void);
+sql5_export void (*cq_close)(void);
 
 static str statusname[7] = { "init", "register", "readytorun", "running", 
"waiting", "paused", "stopping"};
 
@@ -379,6 +379,8 @@ CQerror(Client cntxt, MalBlkPtr mb, MalS
                throw(SQL,"cquery.error","The continuous procedure %s.%s is not 
accessible\n",sch,fcn);
 
        pnet[idx].error = GDKstrdup(error);
+       if(pnet[idx].error == NULL)
+               throw(SQL,"cquery.error",MAL_MALLOC_FAIL);
        return MAL_SUCCEED;
 }
 
diff --git a/sql/backends/monet5/sql_cquery.h b/sql/backends/monet5/sql_cquery.h
--- a/sql/backends/monet5/sql_cquery.h
+++ b/sql/backends/monet5/sql_cquery.h
@@ -19,6 +19,7 @@
 
 #ifndef _CQUERY_
 #define _CQUERY_
+
 #include "mal_interpreter.h"
 #include "sql_scenario.h"
 
@@ -33,7 +34,7 @@
 #define CQSTOP    5    /* stop the scheduler */
 #define CQDEREGISTER  6        /* stop the scheduler */
 
-#define INITIAL_MAXCQ     32           /* it is the minimum, if we need more 
space GDKrealloc */
+#define INITIAL_MAXCQ     32   /* it is the minimum, if we need more space 
GDKrealloc */
 #define MAXSTREAMS       128   /* limit the number of stream columns to be 
looked after per query*/
 
 #define STREAM_IN      1
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list