Changeset: 167490ce1de0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/167490ce1de0
Modified Files:
        gdk/gdk_atoms.c
Branch: Mar2025
Log Message:

Output value that failed to convert in the error msg


diffs (72 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -675,7 +675,7 @@ numFromStr(const char *src, size_t *len,
                                        return (ssize_t) (p - src);
                                }
                        }
-                       GDKerror("not a number");
+                       GDKerror("'%s' not a number\n", src);
                        goto bailout;
                case '-':
                        sign = -1;
@@ -686,7 +686,7 @@ numFromStr(const char *src, size_t *len,
                        break;
                }
                if (!GDKisdigit(*p)) {
-                       GDKerror("not a number");
+                       GDKerror("'%s' not a number\n", src);
                        goto bailout;
                }
        }
@@ -944,12 +944,12 @@ ptrFromStr(const char *src, size_t *len,
                        p += 2;
                }
                if (!GDKisxdigit(*p)) {
-                       GDKerror("not a number\n");
+                       GDKerror("'%s' not a number\n", src);
                        return -1;
                }
                while (GDKisxdigit(*p)) {
                        if (base >= ((size_t) 1 << (8 * sizeof(size_t) - 4))) {
-                               GDKerror("overflow\n");
+                               GDKerror("'%s' overflow\n", src);
                                return -1;
                        }
                        base = mult16(base) + base16(*p);
@@ -1013,7 +1013,7 @@ dblFromStr(const char *src, size_t *len,
                if (n == 0 || (errno == ERANGE && (d < -1 || d > 1))
                    || !isfinite(d) /* no NaN or Infinite */
                    ) {
-                       GDKerror("overflow or not a number\n");
+                       GDKerror("'%s' overflow or not a number\n", src);
                        return -1;
                } else {
                        while (src[n] && GDKisspace(src[n]))
@@ -1092,7 +1092,7 @@ fltFromStr(const char *src, size_t *len,
                n = (ssize_t) (p - src);
                if (n == 0 || (errno == ERANGE && (f < -1 || f > 1))
                    || !isfinite(f) /* no NaN or infinite */) {
-                       GDKerror("overflow or not a number\n");
+                       GDKerror("'%s' overflow or not a number\n", src);
                        return -1;
                } else {
                        while (src[n] && GDKisspace(src[n]))
@@ -1182,7 +1182,7 @@ OIDfromStr(const char *src, size_t *len,
                }
                p += pos;
        } else {
-               GDKerror("not an OID\n");
+               GDKerror("'%s' not an OID\n", src);
                return -1;
        }
        while (GDKisspace(*p))
@@ -1520,7 +1520,7 @@ BLOBfromstr(const char *instr, size_t *l
                if (GDKisxdigit(instr[i]))
                        nitems++;
                else if (!GDKisspace(instr[i])) {
-                       GDKerror("Illegal char in blob\n");
+                       GDKerror("Illegal char '%c' in blob\n", instr[i]);
                        return -1;
                }
        }
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to