Changeset: 81a6949aad1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81a6949aad1e
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
Branch: Jul2017
Log Message:
Removed function TABLETadt_toStr: it's not used.
diffs (62 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
@@ -1800,7 +1800,6 @@ str SYSmem_usage(bat *ret, bat *ret2, co
str SYSsetmem_maxsize(void *ret, const lng *num);
str SYSsetvm_maxsize(void *ret, const lng *num);
str SYSvm_usage(bat *ret, bat *ret2, const lng *minsize);
-int TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a);
str TABLETcollect(BAT **bats, Tablet *as);
str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset);
str TABLETcreate_bats(Tablet *as, BUN est);
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -79,36 +79,6 @@ void_bat_create(int adt, BUN nr)
return b;
}
-int
-TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a)
-{
- (void) extra;
- if (type == TYPE_str) {
- char *dst, *src = a;
- int l;
-
- if (GDK_STRNIL(src)) {
- src = "nil";
- }
- l = (int) strlen(src);
- if (l + 3 > *len) {
- GDKfree(*buf);
- *len = 2 * l + 3;
- *buf = GDKzalloc(*len);
- if( *buf == NULL)
- return 0;
- }
- dst = *buf;
- dst[0] = '"';
- strncpy(dst + 1, src, l);
- dst[l + 1] = '"';
- dst[l + 2] = 0;
- return l + 2;
- } else {
- return (*BATatoms[type].atomToStr) (buf, len, a);
- }
-}
-
void
TABLETdestroy_format(Tablet *as)
{
diff --git a/monetdb5/modules/mal/tablet.h b/monetdb5/modules/mal/tablet.h
--- a/monetdb5/modules/mal/tablet.h
+++ b/monetdb5/modules/mal/tablet.h
@@ -79,7 +79,6 @@ mal_export str TABLETcollect(BAT **bats,
mal_export str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset);
mal_export void TABLETdestroy_format(Tablet *as);
mal_export int TABLEToutput_file(Tablet *as, BAT *order, stream *s);
-mal_export int TABLETadt_toStr(void *extra, char **buf, int *len, int type,
ptr a);
mal_export str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
mal_export str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list