Changeset: 3f6a7d4b8a06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3f6a7d4b8a06
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_logger.c
gdk/gdk_utils.c
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Combined GDKgetenv_isyes and GDKgetenv_istrue into just GDKgetenv_istrue.
I.e., all the values checked with these functions can now have a value of
either "yes" or "true" (any case) to indicate positivity. Also removed
GDKgetenv_istext.
diffs (89 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -296,9 +296,7 @@ char *GDKgetbuf(void);
unsigned GDKgetdebug(void);
const char *GDKgetenv(const char *name);
int GDKgetenv_int(const char *name, int def);
-bool GDKgetenv_istext(const char *name, const char *text);
bool GDKgetenv_istrue(const char *name);
-bool GDKgetenv_isyes(const char *name);
gdk_return GDKinit(struct opt *set, int setlen, bool embedded, const char
*caller_revision);
Heap *GDKinitialize_segment_tree(void);
bool GDKinmemory(int farmid);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3805,8 +3805,6 @@ gdk_export void GDKprintinfo(void);
gdk_export const char *GDKgetenv(const char *name);
-gdk_export bool GDKgetenv_istext(const char *name, const char* text);
-gdk_export bool GDKgetenv_isyes(const char *name);
gdk_export bool GDKgetenv_istrue(const char *name);
gdk_export int GDKgetenv_int(const char *name, int def);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2660,7 +2660,7 @@ log_load(const char *fn, logger *lg, cha
}
ATOMIC_SET(&GDKdebug, dbg);
- bool earlyexit = GDKgetenv_isyes("process-wal-and-exit");
+ bool earlyexit = GDKgetenv_istrue("process-wal-and-exit");
if (readlogs) {
ulng log_id = lg->saved_id + 1;
if (log_readlogs(lg, filename) != GDK_SUCCEED) {
@@ -2712,7 +2712,7 @@ log_load(const char *fn, logger *lg, cha
if (log_json_upgrade_finalize() == GDK_FAIL)
goto error;
#endif
- if (GDKgetenv_isyes("clean-BBP"))
+ if (GDKgetenv_istrue("clean-BBP"))
clean_bbp(lg);
return GDK_SUCCEED;
error:
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -142,23 +142,11 @@ GDKgetenv(const char *name)
}
bool
-GDKgetenv_istext(const char *name, const char *text)
+GDKgetenv_istrue(const char *name)
{
const char *val = GDKgetenv(name);
- return val && strcasecmp(val, text) == 0;
-}
-
-bool
-GDKgetenv_isyes(const char *name)
-{
- return GDKgetenv_istext(name, "yes");
-}
-
-bool
-GDKgetenv_istrue(const char *name)
-{
- return GDKgetenv_istext(name, "true");
+ return val && (strcasecmp(val, "yes") == 0 || strcasecmp(val, "true")
== 0);
}
int
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -654,8 +654,8 @@ SQLinit(Client c, const char *initpasswd
{
const char *debug_str = GDKgetenv("sql_debug");
char *msg = MAL_SUCCEED, *other = MAL_SUCCEED;
- bool readonly = GDKgetenv_isyes("gdk_readonly");
- bool single_user = GDKgetenv_isyes("gdk_single_user");
+ bool readonly = GDKgetenv_istrue("gdk_readonly");
+ bool single_user = GDKgetenv_istrue("gdk_single_user");
static int maybeupgrade = 1;
backend *be = NULL;
mvc *m = NULL;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
