MonetDB: Apr2019 - Simplify code.

[Sjoerd Mullender]

Changeset: 73bdffab5fe6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73bdffab5fe6
Modified Files:
        gdk/gdk_utils.c
        monetdb5/mal/mal_linker.c
Branch: Apr2019
Log Message:

Simplify code.


diffs (48 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -105,14 +105,11 @@ GDKgetenv(const char *name)
 }
 
 bool
-GDKgetenv_istext(const char *name, const char* text)
+GDKgetenv_istext(const char *name, const char *text)
 {
-       char *val = GDKgetenv(name);
+       const char *val = GDKgetenv(name);
 
-       if (val && strcasecmp(val, text) == 0) {
-               return 1;
-       }
-       return 0;
+       return val && strcasecmp(val, text) == 0;
 }
 
 bool
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -438,17 +438,13 @@ MSP_locate_sqlscript(const char *filenam
 int
 malLibraryEnabled(str name) {
        if (strcmp(name, "pyapi") == 0) {
-               char *val = GDKgetenv("embedded_py");
-               if (val && (strcasecmp(val, "2") == 0 || 
GDKgetenv_istrue("embedded_py") || GDKgetenv_istrue("embedded_py"))) {
-                       return true;
-               }
-               return false;
+               const char *val = GDKgetenv("embedded_py");
+               return val && (strcmp(val, "2") == 0 ||
+                                          strcasecmp(val, "true") == 0 ||
+                                          strcasecmp(val, "yes") == 0);
        } else if (strcmp(name, "pyapi3") == 0) {
-               char *val = GDKgetenv("embedded_py");
-               if (val && strcasecmp(val, "3") == 0) {
-                       return true;
-               }
-               return false;
+               const char *val = GDKgetenv("embedded_py");
+               return val && strcasecmp(val, "3") == 0;
        }
        return true;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list