Changeset: 5c63cfd569b2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c63cfd569b2
Modified Files:
gdk/shared_memory.c
monetdb5/extras/pyapi/pyapi.c
Branch: pyapi
Log Message:
Compilation fixes.
diffs (35 lines):
diff --git a/gdk/shared_memory.c b/gdk/shared_memory.c
--- a/gdk/shared_memory.c
+++ b/gdk/shared_memory.c
@@ -187,6 +187,7 @@ str change_semaphore_value_timeout(int s
*succeed = true;
return msg;
#else
+ *succeed = true;
return change_semaphore_value(sem_id, number, change);
#endif
}
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -929,7 +929,10 @@ str PyAPIeval(Client cntxt, MalBlkPtr mb
msg = createException(MAL, "pyapi.eval", MAL_MALLOC_FAIL"
function body string.");
goto wrapup;
}
- fread(exprStr, 1, length, fp);
+ if (fread(exprStr, 1, length, fp) != length) {
+ msg = createException(MAL, "pyapi.eval", "Failed to read from
file \"%s\".", address);
+ goto wrapup;
+ }
fclose(fp);
}
}
@@ -2268,7 +2271,7 @@ BAT *PyObject_ConvertToBAT(PyReturn *ret
size_t index_offset = 0;
char *msg;
size_t iu;
- int sql_token;
+ enum _sqltype sql_token;
if (ret->multidimensional) index_offset = i;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
