Changeset: e1b7fd4637a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1b7fd4637a0
Modified Files:
gdk/gdk_string.c
monetdb5/modules/mal/wlc.c
sql/storage/bat/bat_logger.c
Branch: linear-hashing
Log Message:
Never check against GDK_FAIL, only against GDK_SUCCEED.
diffs (36 lines):
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -989,7 +989,7 @@ concat_strings(BAT **bnp, ValPtr pt, BAT
}
GDKfree(astrings);
}
- if (rres == GDK_FAIL)
+ if (rres != GDK_SUCCEED)
BBPreclaim(bn);
return rres;
diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c
--- a/monetdb5/modules/mal/wlc.c
+++ b/monetdb5/modules/mal/wlc.c
@@ -501,7 +501,7 @@ WLCmaster(Client cntxt, MalBlkPtr mb, Ma
throw(MAL, "wlc.master", "wlc master filename path is
too large");
}
// set location for logs
- if( GDKcreatedir(path) == GDK_FAIL)
+ if( GDKcreatedir(path) != GDK_SUCCEED)
throw(SQL,"wlc.master","Could not create %s\n", path);
len = snprintf(wlc_name, IDLENGTH, "%s", GDKgetenv("gdk_dbname"));
if (len == -1 || len >= IDLENGTH)
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -1047,7 +1047,7 @@ snapshot_bats(stream *plan, const char *
goto end;
}
ret = snapshot_immediate_copy_file(plan, bbpdir, bbpdir +
strlen(db_dir) + 1);
- if (ret == GDK_FAIL)
+ if (ret != GDK_SUCCEED)
goto end;
// Open the catalog and parse the header
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
