MonetDB: Apr2019 - Fixes and simplifications to error logging.

[Sjoerd Mullender]

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

Fixes and simplifications to error logging.


diffs (37 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -966,7 +966,7 @@ doGDKaddbuf(const char *prefix, const ch
                char *dst = buf + strlen(buf);
                size_t maxlen = GDKMAXERRLEN - (dst - buf) - 1;
 
-               if (prefix && *prefix && dst < buf + GDKMAXERRLEN) {
+               if (*prefix && dst < buf + GDKMAXERRLEN) {
                        size_t preflen;
 
                        strncpy(dst, prefix, maxlen);
@@ -979,7 +979,7 @@ doGDKaddbuf(const char *prefix, const ch
                        maxlen = messagelen;
                strncpy(dst, message, maxlen);
                dst += maxlen;
-               if (suffix && *suffix && dst < buf + GDKMAXERRLEN) {
+               if (*suffix && dst < buf + GDKMAXERRLEN) {
                        size_t sufflen;
 
                        maxlen = buf + GDKMAXERRLEN - dst - 1;
@@ -990,9 +990,13 @@ doGDKaddbuf(const char *prefix, const ch
                        dst += sufflen;
                }
                *dst = '\0';
+               fprintf(stderr, "#%s%.*s%s",
+                       prefix[0] == '#' ? prefix + 1 : prefix,
+                       (int) messagelen, message, suffix);
+       } else {
+               THRprintf(GDKout, "%s%.*s%s", prefix,
+                         (int) messagelen, message, suffix);
        }
-       fprintf(stderr, "%s%.*s%s", prefix ? prefix : "",
-               (int) messagelen, message, suffix ? suffix : "");
 }
 
 /* print an error or warning message, making sure the message ends in
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list