MonetDB: alloc-less-str - Don't use generic names

[Pedro Ferreira]

Changeset: e39c6f12a1fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e39c6f12a1fd
Modified Files:
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/str.h
        monetdb5/modules/kernel/batstr.c
        sql/backends/monet5/sql_cast.c
        sql/backends/monet5/sql_result.c
Branch: alloc-less-str
Log Message:

Don't use generic names


diffs (93 lines):

diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -3352,7 +3352,7 @@ STRtostr(str *res, const str *src)
 }
 
 int
-str_length(const char *s)
+str_utf8_length(const char *s)
 {
        size_t l;
 
@@ -3368,12 +3368,12 @@ str_length(const char *s)
 static str
 STRLength(int *res, const str *arg1)
 {
-       *res = str_length(*arg1);
+       *res = str_utf8_length(*arg1);
        return MAL_SUCCEED;
 }
 
 int
-str_bytes(const char *s)
+str_nbytes(const char *s)
 {
        size_t l;
 
@@ -3387,7 +3387,7 @@ str_bytes(const char *s)
 static str
 STRBytes(int *res, const str *arg1)
 {
-       *res = str_bytes(*arg1);
+       *res = str_nbytes(*arg1);
        return MAL_SUCCEED;
 }
 
diff --git a/monetdb5/modules/atoms/str.h b/monetdb5/modules/atoms/str.h
--- a/monetdb5/modules/atoms/str.h
+++ b/monetdb5/modules/atoms/str.h
@@ -46,8 +46,8 @@
                } \
        } while (0)
 
-extern int str_length(const char *s);
-extern int str_bytes(const char *s);
+extern int str_utf8_length(const char *s);
+extern int str_nbytes(const char *s);
 
 extern str str_from_wchr(str *buf, size_t *buflen, int c);
 extern str str_wchr_at(int *res, const char *s, int at);
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -77,13 +77,13 @@ bailout:
 static str
 STRbatLength(bat *ret, const bat *l)
 {
-       return do_batstr_int(ret, l, "batstr.length", str_length);
+       return do_batstr_int(ret, l, "batstr.length", str_utf8_length);
 }
 
 static str
 STRbatBytes(bat *ret, const bat *l)
 {
-       return do_batstr_int(ret, l, "batstr.bytes", str_bytes);
+       return do_batstr_int(ret, l, "batstr.bytes", str_nbytes);
 }
 
 static str
diff --git a/sql/backends/monet5/sql_cast.c b/sql/backends/monet5/sql_cast.c
--- a/sql/backends/monet5/sql_cast.c
+++ b/sql/backends/monet5/sql_cast.c
@@ -145,7 +145,7 @@ SQLstr_cast_str(str *r, int *rlen, str v
 {
        int intput_strlen;
 
-       if (!strNil(v) && len > 0 && str_length(v) > len)
+       if (!strNil(v) && len > 0 && str_utf8_length(v) > len)
                throw(SQL, "str_cast", SQLSTATE(22001) "value too long for type 
(var)char(%d)", len);
 
        intput_strlen = (int) strlen(v) + 1;
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -626,7 +626,7 @@ static void *
                int slen;
 
                s = c->data;
-               slen = str_length(s);
+               slen = str_utf8_length(s);
                if (col->type.digits > 0 && len > 0 && slen > (int) 
col->type.digits) {
                        len = STRwidth(c->data);
                        if (len > (ssize_t) col->type.digits)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list