MonetDB: Jul2021 - When checking for GDK errors only compare wit...

[Sjoerd Mullender]

Changeset: 2a8c6e451fdf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2a8c6e451fdf
Modified Files:
        ctest/monetdb5/mal/test_malEmbeddedBoot.c
        ctest/monetdb5/mal/test_malInclude.c
        gdk/gdk_logger.c
        monetdb5/modules/mal/tracer.c
        tools/monetdbe/monetdbe.c
Branch: Jul2021
Log Message:

When checking for GDK errors only compare with GDK_SUCCEED.


diffs (78 lines):

diff --git a/ctest/monetdb5/mal/test_malEmbeddedBoot.c 
b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
--- a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
+++ b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
@@ -17,7 +17,7 @@ main(void)
     gdk_return gdk_res;
 
     gdk_res = GDKinit(NULL, 0, true);
-    if (gdk_res == GDK_FAIL) {
+    if (gdk_res != GDK_SUCCEED) {
        msg = createException(MAL, "embedded.monetdb_startup", "GDKinit() 
failed");
         return 1;
     }
diff --git a/ctest/monetdb5/mal/test_malInclude.c 
b/ctest/monetdb5/mal/test_malInclude.c
--- a/ctest/monetdb5/mal/test_malInclude.c
+++ b/ctest/monetdb5/mal/test_malInclude.c
@@ -18,7 +18,7 @@ main(void)
     gdk_return gdk_res;
 
     gdk_res = GDKinit(NULL, 0, true);
-    if (gdk_res == GDK_FAIL) {
+    if (gdk_res != GDK_SUCCEED) {
        createException(MAL, "embedded.monetdb_startup", "GDKinit() failed");
        return 1;
     }
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -908,7 +908,7 @@ logger_create_types_file(logger *lg, con
                return GDK_FAIL;
        }
 
-       if (logger_write_new_types(lg, fp) == GDK_FAIL) {
+       if (logger_write_new_types(lg, fp) != GDK_SUCCEED) {
                fclose(fp);
                MT_remove(filename);
                GDKerror("writing log file %s failed", filename);
@@ -1866,7 +1866,7 @@ logger_load(int debug, const char *fn, c
        if (BBPrename(lg->catalog_lid->batCacheid, bak) < 0) {
                goto error;
        }
-       if (bm_get_counts(lg) == GDK_FAIL)
+       if (bm_get_counts(lg) != GDK_SUCCEED)
                goto error;
 
        strconcat_len(bak, sizeof(bak), fn, "_seqs_id", NULL);
@@ -2158,7 +2158,7 @@ logger_flush(logger *lg, ulng ts)
                        }
 
                        bool filemissing = false;
-                       if (logger_open_input(lg, filename, &filemissing) == 
GDK_FAIL) {
+                       if (logger_open_input(lg, filename, &filemissing) != 
GDK_SUCCEED) {
                                GDKfree(filename);
                                return GDK_FAIL;
                        }
diff --git a/monetdb5/modules/mal/tracer.c b/monetdb5/modules/mal/tracer.c
--- a/monetdb5/modules/mal/tracer.c
+++ b/monetdb5/modules/mal/tracer.c
@@ -139,7 +139,7 @@ TRACERcomp_info(Client cntxt, MalBlkPtr 
 
     // Fill the BATs
     MT_lock_set(&mal_delayLock);
-       if(GDKtracer_fill_comp_info(id, component, log_level) == GDK_FAIL) {
+       if(GDKtracer_fill_comp_info(id, component, log_level) != GDK_SUCCEED) {
                MT_lock_unset(&mal_delayLock);
                BBPunfix(id->batCacheid);
                BBPunfix(component->batCacheid);
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -709,7 +709,7 @@ monetdbe_startup(monetdbe_database_inter
        }
        gdk_res = GDKinit(set, setlen, true);
        mo_free_options(set, setlen);
-       if (gdk_res == GDK_FAIL) {
+       if (gdk_res != GDK_SUCCEED) {
                mdbe->msg = createException(MAL, "monetdbe.monetdbe_startup", 
"GDKinit() failed");
                goto cleanup;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list