Changeset: 1af29dec8521 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1af29dec8521 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_calc.c gdk/gdk_storage.c gdk/gdk_value.c geom/lib/libgeom.c geom/monetdb5/geom.c geom/monetdb5/geom.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_parser.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/wlr.c sql/server/sql_atom.c sql/server/sql_parser.y testing/malcheck.py Branch: default Log Message:
atomToStr and atomFromStr now return ssize_t and use size_t*. diffs (truncated from 3771 to 300 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 @@ -13,7 +13,7 @@ int ATOMallocate(const char *nme); int ATOMcmp(int id, const void *v_1, const void *v_2); ptr ATOMdup(int id, const void *val); bte ATOMelmshift(int sz); -int ATOMformat(int id, const void *val, char **buf); +ssize_t ATOMformat(int id, const void *val, char **buf); int ATOMindex(const char *nme); int ATOMlen(int id, const void *v); str ATOMname(int id); @@ -303,8 +303,8 @@ int MT_munmap(void *p, size_t len); int MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); void OIDXdestroy(BAT *b); -int OIDfromStr(const char *src, int *len, oid **dst); -int OIDtoStr(str *dst, int *len, const oid *src); +ssize_t OIDfromStr(const char *src, size_t *len, oid **dst); +ssize_t OIDtoStr(str *dst, size_t *len, const oid *src); BUN ORDERfnd(BAT *b, const void *v); BUN ORDERfndfirst(BAT *b, const void *v); BUN ORDERfndlast(BAT *b, const void *v); @@ -330,7 +330,7 @@ int VALcmp(const ValRecord *p, const Val ptr VALconvert(int typ, ValPtr t); ValPtr VALcopy(ValPtr dst, const ValRecord *src); void VALempty(ValPtr v); -int VALformat(char **buf, const ValRecord *res); +ssize_t VALformat(char **buf, const ValRecord *res); void *VALget(ValPtr v); ValPtr VALinit(ValPtr d, int tpe, const void *s); int VALisnil(const ValRecord *v); @@ -368,26 +368,26 @@ BAT *VIEWcreate(oid seq, BAT *b); BAT *VIEWcreate_(oid seq, BAT *b, int stable); size_t _MT_npages; size_t _MT_pagesize; -int batFromStr(const char *src, int *len, bat **dst); -int batToStr(str *dst, int *len, const bat *src); -int bitFromStr(const char *src, int *len, bit **dst); -int bitToStr(str *dst, int *len, const bit *src); -int bteFromStr(const char *src, int *len, bte **dst); -int bteToStr(str *dst, int *len, const bte *src); +ssize_t batFromStr(const char *src, size_t *len, bat **dst); +ssize_t batToStr(str *dst, size_t *len, const bat *src); +ssize_t bitFromStr(const char *src, size_t *len, bit **dst); +ssize_t bitToStr(str *dst, size_t *len, const bit *src); +ssize_t bteFromStr(const char *src, size_t *len, bte **dst); +ssize_t bteToStr(str *dst, size_t *len, const bte *src); const bte bte_nil; int closedir(DIR *dir); -int dblFromStr(const char *src, int *len, dbl **dst); -int dblToStr(str *dst, int *len, const dbl *src); +ssize_t dblFromStr(const char *src, size_t *len, dbl **dst); +ssize_t dblToStr(str *dst, size_t *len, const dbl *src); const dbl dbl_nil; char *dirname(char *path); int dlclose(void *handle); char *dlerror(void); void *dlopen(const char *file, int mode); void *dlsym(void *handle, const char *name); -int escapedStr(char *dst, const char *src, int dstlen, const char *sep1, const char *sep2, int quote); -int escapedStrlen(const char *src, const char *sep1, const char *sep2, int quote); -int fltFromStr(const char *src, int *len, flt **dst); -int fltToStr(str *dst, int *len, const flt *src); +size_t escapedStr(char *dst, const char *src, size_t dstlen, const char *sep1, const char *sep2, int quote); +size_t escapedStrlen(const char *src, const char *sep1, const char *sep2, int quote); +ssize_t fltFromStr(const char *src, size_t *len, flt **dst); +ssize_t fltToStr(str *dst, size_t *len, const flt *src); const flt flt_nil; geomcatalogfix_fptr geomcatalogfix_get(void); void geomcatalogfix_set(geomcatalogfix_fptr); @@ -399,14 +399,14 @@ bat getBBPsize(void); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t *__restrict, void *( *fcn)(void *), void *__restrict); -int hgeFromStr(const char *src, int *len, hge **dst); -int hgeToStr(str *dst, int *len, const hge *src); +ssize_t hgeFromStr(const char *src, size_t *len, hge **dst); +ssize_t hgeToStr(str *dst, size_t *len, const hge *src); const hge hge_nil; -int intFromStr(const char *src, int *len, int **dst); -int intToStr(str *dst, int *len, const int *src); +ssize_t intFromStr(const char *src, size_t *len, int **dst); +ssize_t intToStr(str *dst, size_t *len, const int *src); const int int_nil; -int lngFromStr(const char *src, int *len, lng **dst); -int lngToStr(str *dst, int *len, const lng *src); +ssize_t lngFromStr(const char *src, size_t *len, lng **dst); +ssize_t lngToStr(str *dst, size_t *len, const lng *src); const lng lng_nil; gdk_return log_abort(logger *lg); gdk_return log_bat(logger *lg, BAT *b, const char *n); @@ -471,15 +471,15 @@ void pthread_sema_init(pthread_sema_t *s void pthread_sema_init(pthread_sema_t *s, int flag, int nresources); void pthread_sema_up(pthread_sema_t *s); void pthread_sema_up(pthread_sema_t *s); -int ptrFromStr(const char *src, int *len, ptr **dst); -int ptrToStr(str *dst, int *len, const ptr *src); +ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst); +ssize_t ptrToStr(str *dst, size_t *len, const ptr *src); const ptr ptr_nil; struct dirent *readdir(DIR *dir); void rewinddir(DIR *dir); -int shtFromStr(const char *src, int *len, sht **dst); -int shtToStr(str *dst, int *len, const sht *src); +ssize_t shtFromStr(const char *src, size_t *len, sht **dst); +ssize_t shtToStr(str *dst, size_t *len, const sht *src); const sht sht_nil; -int strFromStr(const char *src, int *len, str *dst); +ssize_t strFromStr(const char *src, size_t *len, str *dst); BUN strHash(const char *s); int strLen(const char *s); int strNil(const char *s); @@ -824,7 +824,7 @@ int BLOBcmp(const blob *l, const blob *r void BLOBdel(Heap *h, var_t *index); str BLOBfromblob(str *retval, blob **b); str BLOBfromidx(str *retval, blob **binp, int *index); -int BLOBfromstr(const char *instr, int *l, blob **val); +ssize_t BLOBfromstr(const char *instr, size_t *l, blob **val); int BLOBget(Heap *h, int *bun, int *l, blob **val); BUN BLOBhash(const blob *b); void BLOBheap(Heap *heap, size_t capacity); @@ -836,7 +836,7 @@ var_t BLOBput(Heap *h, var_t *bun, const blob *BLOBread(blob *a, stream *s, size_t cnt); str BLOBsqlblob_fromstr(sqlblob **b, const char **d); str BLOBtoblob(blob **retval, str *s); -int BLOBtostr(str *tostr, int *l, const blob *pin); +ssize_t BLOBtostr(str *tostr, size_t *l, const blob *pin); gdk_return BLOBwrite(const blob *a, stream *s, size_t cnt); str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1142,9 +1142,9 @@ str GRPsubgroup7(bat *ngid, bat *next, c str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const bat *eid, const bat *hid); str GRPsubgroup9(bat *ngid, bat *next, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); str IDentifier(identifier *retval, str *in); -int IDfromString(const char *src, int *len, identifier *retval); +ssize_t IDfromString(const char *src, size_t *len, identifier *retval); str IDprelude(void *ret); -int IDtoString(str *retval, int *len, const char *handle); +ssize_t IDtoString(str *retval, size_t *len, const char *handle); str ILIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const str *esc, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str ILIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str INET_comp_CS(bit *retval, const inet *val1, const inet *val2); @@ -1163,7 +1163,7 @@ str INET_isnil(bit *retval, const inet * str INETabbrev(str *retval, const inet *val); str INETbroadcast(inet *retval, const inet *val); int INETcompare(const inet *l, const inet *r); -int INETfromString(const char *src, int *len, inet **retval); +ssize_t INETfromString(const char *src, size_t *len, inet **retval); str INEThost(str *retval, const inet *val); str INEThostmask(inet *retval, const inet *val); str INETmasklen(int *retval, const inet *val); @@ -1173,7 +1173,7 @@ str INETnew(inet *retval, str *in); const inet *INETnull(void); str INETsetmasklen(inet *retval, const inet *val, const int *msk); str INETtext(str *retval, const inet *val); -int INETtoString(str *retval, int *len, const inet *handle); +ssize_t INETtoString(str *retval, size_t *len, const inet *handle); str INSPECTatom_names(bat *ret); str INSPECTatom_sizes(bat *ret); str INSPECTatom_sup_names(bat *ret); @@ -1226,7 +1226,7 @@ str JSONfilterArray_int(json *ret, json str JSONfilterArray_lng(json *ret, json *j, lng *index); str JSONfilterArray_sht(json *ret, json *j, sht *index); str JSONfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -int JSONfromString(const char *src, int *len, json *x); +ssize_t JSONfromString(const char *src, size_t *len, json *x); str JSONgroupStr(str *ret, const bat *bid); str JSONisarray(bit *ret, json *j); str JSONisobject(bit *ret, json *j); @@ -1248,7 +1248,7 @@ str JSONsubjson(bat *retval, bat *bid, b str JSONsubjsoncand(bat *retval, bat *bid, bat *gid, bat *eid, bat *id, bit *skip_nils); str JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit *flg); str JSONtextString(str *ret, bat *bid); -int JSONtoString(str *s, int *len, const char *src); +ssize_t JSONtoString(str *s, size_t *len, const char *src); str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONvalueArray(json *ret, json *arg); str JSONvalueTable(bat *ret, json *j); @@ -1713,8 +1713,8 @@ str SERVERsetAlias(void *ret, int *mid, str SERVERstop(void *ret); str SERVERsuspend(void *ret); str SERVERtrace(void *ret, int *mid, int *flag); -int SQLBLOBfromstr(const char *instr, int *l, blob **val); -int SQLBLOBtostr(str *tostr, int *l, const blob *pin); +ssize_t SQLBLOBfromstr(const char *instr, size_t *l, blob **val); +ssize_t SQLBLOBtostr(str *tostr, size_t *l, const blob *pin); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best); str STRBytes(int *res, const str *arg1); str STRConcat(str *res, const str *val1, const str *val2); @@ -1845,7 +1845,7 @@ int TYPE_sqlblob; int TYPE_timestamp; int TYPE_tzone; int TYPE_xml; -int URLfromString(const char *src, int *len, str *u); +ssize_t URLfromString(const char *src, size_t *len, str *u); str URLgetAnchor(str *retval, url *val); str URLgetBasename(str *retval, url *t); str URLgetContent(str *retval, url *Str1); @@ -1864,10 +1864,10 @@ str URLnew(url *u, str *val); str URLnew3(url *u, str *protocol, str *server, str *file); str URLnew4(url *u, str *protocol, str *server, int *port, str *file); str URLnoop(url *u, url *val); -int URLtoString(str *s, int *len, const char *src); +ssize_t URLtoString(str *s, size_t *len, const char *src); int UUIDcompare(const uuid *l, const uuid *r); str UUIDequal(bit *retval, uuid **l, uuid **r); -int UUIDfromString(const char *svalue, int *len, uuid **retval); +ssize_t UUIDfromString(const char *svalue, size_t *len, uuid **retval); str UUIDgenerateUuid(uuid **retval); BUN UUIDhash(const void *u); str UUIDisaUUID(bit *retval, str *u); @@ -1875,7 +1875,7 @@ const uuid *UUIDnull(void); str UUIDprelude(void *ret); uuid *UUIDread(uuid *u, stream *s, size_t cnt); str UUIDstr2uuid(uuid **retval, str *s); -int UUIDtoString(str *retval, int *len, const uuid *value); +ssize_t UUIDtoString(str *retval, size_t *len, const uuid *value); str UUIDuuid2str(str *retval, uuid **u); gdk_return UUIDwrite(const uuid *u, stream *s, size_t cnt); str WLCaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1912,7 +1912,7 @@ str XMLdocument(xml *x, str *s); str XMLelement(xml *ret, str *name, xml *nspace, xml *attr, xml *val); str XMLelementSmall(xml *ret, str *name, xml *val); str XMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -int XMLfromString(const char *src, int *len, xml *x); +ssize_t XMLfromString(const char *src, size_t *len, xml *x); str XMLisdocument(bit *x, str *s); str XMLparse(xml *x, str *doccont, str *s, str *option); str XMLpi(xml *x, str *target, str *s); @@ -1920,7 +1920,7 @@ str XMLprelude(void *ret); size_t XMLquotestring(const char *s, char *buf, size_t len); str XMLroot(xml *x, xml *v, str *version, str *standalone); str XMLstr2xml(xml *x, const char **s); -int XMLtoString(str *s, int *len, const char *src); +ssize_t XMLtoString(str *s, size_t *len, const char *src); size_t XMLunquotestring(const char **p, char q, char *buf); str XMLxml2str(str *s, xml *x); str XMLxml2xml(xml *x, xml *s); @@ -2010,8 +2010,8 @@ str closeRef; void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); void clrInstruction(InstrPtr p); -int color_fromstr(const char *colorStr, int *len, color **c); -int color_tostr(char **colorStr, int *len, const color *c); +ssize_t color_fromstr(const char *colorStr, size_t *len, color **c); +ssize_t color_tostr(char **colorStr, size_t *len, const color *c); str columnBindRef; str columnRef; str commitRef; @@ -2045,11 +2045,11 @@ str create_viewRef; str crossRef; str dataflowRef; str dateRef; -int date_fromstr(const char *buf, int *len, date **d); -int date_tostr(str *buf, int *len, const date *val); -int daytime_fromstr(const char *buf, int *len, daytime **ret); -int daytime_tostr(str *buf, int *len, const daytime *val); -int daytime_tz_fromstr(const char *buf, int *len, daytime **ret); +ssize_t date_fromstr(const char *buf, size_t *len, date **d); +ssize_t date_tostr(str *buf, size_t *len, const date *val); +ssize_t daytime_fromstr(const char *buf, size_t *len, daytime **ret); +ssize_t daytime_tostr(str *buf, size_t *len, const daytime *val); +ssize_t daytime_tz_fromstr(const char *buf, size_t *len, daytime **ret); str dblRef; str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); @@ -2474,8 +2474,8 @@ str rollbackRef; str row_numberRef; str rpcRef; str rsColumnRef; -int rule_fromstr(const char *buf, int *len, rule **d); -int rule_tostr(str *buf, int *len, const rule *r); +ssize_t rule_fromstr(const char *buf, size_t *len, rule **d); +ssize_t rule_tostr(str *buf, size_t *len, const rule *r); str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env); str runMALDebugger(Client cntxt, MalBlkPtr mb); str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); @@ -2564,11 +2564,11 @@ str thetajoinRef; str thetaselectRef; str tidRef; str timestampRef; -int timestamp_fromstr(const char *buf, int *len, timestamp **ret); +ssize_t timestamp_fromstr(const char *buf, size_t *len, timestamp **ret); timestamp *timestamp_nil; -int timestamp_tostr(str *buf, int *len, const timestamp *val); -int timestamp_tz_fromstr(const char *buf, int *len, timestamp **ret); -int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone *timezone); +ssize_t timestamp_tostr(str *buf, size_t *len, const timestamp *val); +ssize_t timestamp_tz_fromstr(const char *buf, size_t *len, timestamp **ret); +ssize_t timestamp_tz_tostr(str *buf, size_t *len, const timestamp *val, const tzone *timezone); str transactionRef; str transaction_abortRef; str transaction_beginRef; @@ -2578,9 +2578,9 @@ str transaction_rollbackRef; void trimMalVariables(MalBlkPtr mb, MalStkPtr stk); void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb); void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int silent); -int tzone_fromstr(const char *buf, int *len, tzone **d); +ssize_t tzone_fromstr(const char *buf, size_t *len, tzone **d); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
