Changeset: 6652ca14fdec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6652ca14fdec
Modified Files:
sql/backends/monet5/sql_gencode.c
Branch: Nov2019
Log Message:
Simplify initialization.
diffs (27 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -438,19 +438,14 @@ static int
char *mal_session_uuid, *err = NULL;
if (!GDKinmemory() && (err = msab_getUUID(&mal_session_uuid)) == NULL) {
+ str lsupervisor_session = GDKstrdup(mal_session_uuid);
str rsupervisor_session = GDKstrdup(mal_session_uuid);
- if (rsupervisor_session == NULL) {
- free(mal_session_uuid);
- return -1;
- }
-
- str lsupervisor_session = GDKstrdup(mal_session_uuid);
- if (lsupervisor_session == NULL) {
- free(mal_session_uuid);
+ free(mal_session_uuid);
+ if (lsupervisor_session == NULL || rsupervisor_session == NULL)
{
+ GDKfree(lsupervisor_session);
GDKfree(rsupervisor_session);
return -1;
}
- free(mal_session_uuid);
str rworker_plan_uuid = generateUUID();
if (rworker_plan_uuid == NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
