Changeset: 88c777541644 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88c777541644
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
Branch: Jul2017
Log Message:
Removed unused function TABLETadt_frStr.
diffs (63 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);
-void *TABLETadt_frStr(Column *c, int type, char *s, char *e, char quote);
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);
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,37 +79,6 @@ void_bat_create(int adt, BUN nr)
return b;
}
-static void *
-TABLETstrFrStr(Column *c, char *s, char *e)
-{
- int len = (int) (e - s + 1); /* 64bit: should check for overflow */
-
- if (c->len < len) {
- c->len = len;
- c->data = GDKrealloc(c->data, len);
- }
-
- if (s == e) {
- *(char *) c->data = 0;
- } else if (GDKstrFromStr(c->data, (unsigned char *) s, (ssize_t) (e -
s)) < 0) {
- return NULL;
- }
- return c->data;
-}
-
-void *
-TABLETadt_frStr(Column *c, int type, char *s, char *e, char quote)
-{
- if (s == NULL || (!quote && strcmp(s, "nil") == 0)) {
- memcpy(c->data, ATOMnilptr(type), c->nillen);
- } else if (type == TYPE_str) {
- return TABLETstrFrStr(c, s, e);
- } else if ((*BATatoms[type].atomFromStr) (s, &c->len, (ptr) &c->data) <
0) {
- return NULL;
- }
- return c->data;
-}
-
int
TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a)
{
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 void *TABLETadt_frStr(Column *c, int type, char *s, char *e, char
quote);
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
