Changeset: 2b94ad6082ad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2b94ad6082ad
Modified Files:
gdk/gdk_atoms.h
gdk/gdk_string.c
Branch: directappend
Log Message:
Let strPrintWidth return int, not size_t
It sometimes returns int_nil so it's clearly a true int, not a size_t.
diffs (24 lines):
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -136,7 +136,7 @@ gdk_export ssize_t GDKstrFromStr(unsigne
gdk_export ssize_t strFromStr(const char *restrict src, size_t *restrict len,
str *restrict dst, bool external);
gdk_export size_t escapedStrlen(const char *restrict src, const char *sep1,
const char *sep2, int quote);
gdk_export size_t escapedStr(char *restrict dst, const char *restrict src,
size_t dstlen, const char *sep1, const char *sep2, int quote);
-gdk_export size_t strPrintWidth(const char *restrict s);
+gdk_export int strPrintWidth(const char *restrict s);
/*
* @- nil values
* All types have a single value designated as a NIL value. It
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -585,7 +585,7 @@ strFromStr(const char *restrict src, siz
(ssize_t) (cur - start));
}
-size_t
+int
strPrintWidth(const char *restrict s)
{
int len = 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list