Changeset: 98e97b26b202 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/98e97b26b202
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_atoms.c
gdk/gdk_atoms.h
Branch: default
Log Message:
Remove unused functions batToStr and batFromStr.
diffs (93 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
@@ -466,8 +466,6 @@ size_t _MT_pagesize;
const union _dbl_nil_t _dbl_nil_;
const union _flt_nil_t _flt_nil_;
char *asctime_r(const struct tm *restrict, char *restrict);
-ssize_t batFromStr(const char *src, size_t *len, bat **dst, bool external);
-ssize_t batToStr(str *dst, size_t *len, const bat *src, bool external);
ssize_t bitFromStr(const char *src, size_t *len, bit **dst, bool external);
ssize_t bitToStr(str *dst, size_t *len, const bit *src, bool external);
size_t blobsize(size_t nitems) __attribute__((__const__));
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -550,65 +550,6 @@ bitToStr(char **dst, size_t *len, const
return 5;
}
-ssize_t
-batFromStr(const char *src, size_t *len, bat **dst, bool external)
-{
- char *s;
- const char *t, *r = src;
- int c;
- bat bid = 0;
-
- atommem(sizeof(bat));
-
- if (strNil(src)) {
- **dst = bat_nil;
- return 1;
- }
-
- while (GDKisspace(*r))
- r++;
-
- if (external && strcmp(r, "nil") == 0) {
- **dst = bat_nil;
- return (ssize_t) (r - src) + 3;
- }
-
- if (*r == '<')
- r++;
- t = r;
- while ((c = *t) && (c == '_' || GDKisalnum(c)))
- t++;
-
- s = GDKstrndup(r, t - r);
- if (s == NULL)
- return -1;
- bid = BBPindex(s);
- GDKfree(s);
- **dst = bid == 0 ? bat_nil : bid;
- return (ssize_t) (t + (c == '>') - src);
-}
-
-ssize_t
-batToStr(char **dst, size_t *len, const bat *src, bool external)
-{
- bat b = *src;
- size_t i;
- str s;
-
- if (is_bat_nil(b) || !BBPcheck(b) || (s = BBP_logical(b)) == NULL || *s
== 0) {
- atommem(4);
- if (external) {
- strcpy(*dst, "nil");
- return 3;
- }
- strcpy(*dst, str_nil);
- return 1;
- }
- i = strlen(s) + 3;
- atommem(i);
- return (ssize_t) strconcat_len(*dst, *len, "<", s, ">", NULL);
-}
-
/*
* numFromStr parses the head of the string for a number, accepting an
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -118,8 +118,6 @@ gdk_export ssize_t lngFromStr(const char
gdk_export ssize_t lngToStr(str *dst, size_t *len, const lng *src, bool
external);
gdk_export ssize_t intFromStr(const char *src, size_t *len, int **dst, bool
external);
gdk_export ssize_t intToStr(str *dst, size_t *len, const int *src, bool
external);
-gdk_export ssize_t batFromStr(const char *src, size_t *len, bat **dst, bool
external);
-gdk_export ssize_t batToStr(str *dst, size_t *len, const bat *src, bool
external);
gdk_export ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst, bool
external);
gdk_export ssize_t ptrToStr(str *dst, size_t *len, const ptr *src, bool
external);
gdk_export ssize_t bitFromStr(const char *src, size_t *len, bit **dst, bool
external);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
