Changeset: ea2a00ffc0c4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ea2a00ffc0c4 Modified Files: clients/Tests/exports.stable.out Branch: ordered-set-aggregates Log Message:
approved output diffs (truncated from 751 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 @@ -282,7 +282,7 @@ bool GDKexiting(void); jmp_buf GDKfataljump; bit GDKfataljumpenable; str GDKfatalmsg; -char *GDKfilepath(int farmid, const char *dir, const char *nme, const char *ext); +gdk_return GDKfilepath(char *buf, size_t bufsize, int farmid, const char *dir, const char *nme, const char *ext) __attribute__((__access__(write_only, 1, 2))); void GDKfree(void *blk); char *GDKgetbuf(void); unsigned GDKgetdebug(void); @@ -301,7 +301,7 @@ MT_Lock *volatile GDKlocklist; ATOMIC_FLAG GDKlocklistlock; ATOMIC_TYPE GDKlocksleepcnt; void GDKlockstatistics(int); -void *GDKmalloc(size_t size) __attribute__((__malloc__)) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); +void *GDKmalloc(size_t size) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); size_t GDKmallocated(const void *s); size_t GDKmem_cursize(void); gdk_return GDKmergeidx(BAT *b, BAT **a, int n_ar); @@ -324,9 +324,9 @@ stream *GDKstdout; ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char *restrict src, ssize_t len, char quote); int GDKstrcasecmp(const char *s1, const char *s2); char *GDKstrcasestr(const char *haystack, const char *needle); -str GDKstrdup(const char *s) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +str GDKstrdup(const char *s) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__warn_unused_result__)); int GDKstrncasecmp(const char *str1, const char *str2, size_t l1, size_t l2); -str GDKstrndup(const char *s, size_t n) __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); +str GDKstrndup(const char *s, size_t n) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__warn_unused_result__)); gdk_return GDKtolower(char **restrict buf, size_t *restrict buflen, const char *restrict s) __attribute__((__access__(read_write, 1))) __attribute__((__access__(read_write, 2))); gdk_return GDKtoupper(char **restrict buf, size_t *restrict buflen, const char *restrict s) __attribute__((__access__(read_write, 1))) __attribute__((__access__(read_write, 2))); gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level); @@ -348,7 +348,7 @@ gdk_return GDKupgradevarheap(BAT *b, var lng GDKusec(void); const char *GDKversion(void) __attribute__((__const__)); size_t GDKvm_cursize(void); -void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); +void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); void HASHdestroy(BAT *b); BUN HASHlist(Hash *h, BUN i); BUN HASHprobe(const Hash *h, const void *v); @@ -527,15 +527,15 @@ int dlclose(void *handle); char *dlerror(void); void *dlopen(const char *file, int mode); void *dlsym(void *handle, const char *name); -_Noreturn void eb_error(exception_buffer *eb, char *msg, int val); +_Noreturn void eb_error(exception_buffer *eb, const char *msg, int val); exception_buffer *eb_init(exception_buffer *eb) __attribute__((__access__(write_only, 1))); size_t escapedStr(char *restrict dst, const char *restrict src, size_t dstlen, const char *sep1, const char *sep2, int quote); size_t escapedStrlen(const char *restrict src, const char *sep1, const char *sep2, int quote); ssize_t fltFromStr(const char *src, size_t *len, flt **dst, bool external); ssize_t fltToStr(str *dst, size_t *len, const flt *src, bool external); const flt flt_nil; -gdk_return gdk_add_callback(char *name, gdk_callback_func *f, int argc, void *argv[], int interval); -gdk_return gdk_remove_callback(char *, gdk_callback_func *f); +gdk_return gdk_add_callback(const char *name, gdk_callback_func *f, int argc, void *argv[], int interval); +gdk_return gdk_remove_callback(const char *, gdk_callback_func *f); bat getBBPsize(void); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); @@ -840,147 +840,147 @@ int UTF8_strwidth(const char *s); void addMalException(MalBlkPtr mb, str msg); str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name); str addPipeDefinition(Client cntxt, const char *name, const char *pipe); -const char *affectedRowsRef; -const char *aggrRef; -const char *alarmRef; -const char *algebraRef; -const char *alter_add_range_partitionRef; -const char *alter_add_tableRef; -const char *alter_add_value_partitionRef; -const char *alter_del_tableRef; -const char *alter_seqRef; -const char *alter_set_tableRef; -const char *alter_tableRef; -const char *alter_userRef; -const char *appendBulkRef; -const char *appendRef; -const char *assertRef; -const char *avgRef; -const char *bandjoinRef; +const char affectedRowsRef[]; +const char aggrRef[]; +const char alarmRef[]; +const char algebraRef[]; +const char alter_add_range_partitionRef[]; +const char alter_add_tableRef[]; +const char alter_add_value_partitionRef[]; +const char alter_del_tableRef[]; +const char alter_seqRef[]; +const char alter_set_tableRef[]; +const char alter_tableRef[]; +const char alter_userRef[]; +const char appendBulkRef[]; +const char appendRef[]; +const char assertRef[]; +const char avgRef[]; +const char bandjoinRef[]; void batAfterCall(ValPtr v, ValPtr bak); void batBeforeCall(ValPtr v, ValPtr bak); -const char *batRef; -const char *batalgebraRef; -const char *batcalcRef; -const char *batcapiRef; -const char *batmalRef; -const char *batmkeyRef; -const char *batmmathRef; -const char *batmtimeRef; -const char *batpyapi3Ref; -const char *batrapiRef; -const char *batsqlRef; -const char *batstrRef; +const char batRef[]; +const char batalgebraRef[]; +const char batcalcRef[]; +const char batcapiRef[]; +const char batmalRef[]; +const char batmkeyRef[]; +const char batmmathRef[]; +const char batmtimeRef[]; +const char batpyapi3Ref[]; +const char batrapiRef[]; +const char batsqlRef[]; +const char batstrRef[]; bool batstr_func_has_candidates(const char *func); -const char *bbpRef; -const char *betweenRef; -const char *bindRef; -const char *binddbatRef; -const char *bindidxRef; -const char *blockRef; -const char *bstreamRef; -const char *calcRef; +const char bbpRef[]; +const char betweenRef[]; +const char bindRef[]; +const char binddbatRef[]; +const char bindidxRef[]; +const char blockRef[]; +const char bstreamRef[]; +const char calcRef[]; str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[]); -const char *capiRef; +const char capiRef[]; str cfcnDefinition(Symbol s, str t, int flg, str base, size_t len); str chkDeclarations(MalBlkPtr mb); str chkFlow(MalBlkPtr mb); int chkInstruction(Module s, MalBlkPtr mb, InstrPtr p); str chkProgram(Module s, MalBlkPtr mb); str chkTypes(Module s, MalBlkPtr mb, int silent); -const char *claimRef; +const char claimRef[]; void clearTrace(Client cntxt); void clearVariable(MalBlkPtr mb, int varid); -const char *clear_tableRef; +const char clear_tableRef[]; int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); void clrInstruction(InstrPtr p); -const char *columnBindRef; -const char *comment_onRef; +const char columnBindRef[]; +const char comment_onRef[]; str compileString(Symbol *fcn, Client c, str s); -const char *compressRef; +const char compressRef[]; char *concatErrors(char *err1, const char *err2) __attribute__((__nonnull__(1, 2))) __attribute__((__returns_nonnull__)); -const char *connectRef; -const char *containsRef; +const char connectRef[]; +const char containsRef[]; str convertConstant(malType type, ValPtr vr); InstrPtr copyInstruction(const InstrRecord *p); InstrPtr copyInstructionArgs(const InstrRecord *p, int args); MalBlkPtr copyMalBlk(MalBlkPtr mb); -const char *copy_fromRef; -const char *corrRef; -const char *countRef; -const char *count_no_nilRef; +const char copy_fromRef[]; +const char corrRef[]; +const char countRef[]; +const char count_no_nilRef[]; int cpyConstant(MalBlkPtr mb, VarPtr vr); -str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 3, 4))) __attribute__((__returns_nonnull__)); -str createMalException(MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 4, 5))) __attribute__((__returns_nonnull__)); -const char *create_functionRef; -const char *create_roleRef; -const char *create_schemaRef; -const char *create_seqRef; -const char *create_tableRef; -const char *create_triggerRef; -const char *create_typeRef; -const char *create_userRef; -const char *create_viewRef; -const char *crossRef; -const char *cume_distRef; -const char *dataflowRef; -const char *dblRef; +str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__malloc__)) __attribute__((__malloc__(freeException, 1))) __attribute__((__format__(__printf__, 3, 4))) __attribute__((__returns_nonnull__)); +str createMalException(MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__malloc__)) __attribute__((__malloc__(freeException, 1))) __attribute__((__format__(__printf__, 4, 5))) __attribute__((__returns_nonnull__)); +const char create_functionRef[]; +const char create_roleRef[]; +const char create_schemaRef[]; +const char create_seqRef[]; +const char create_tableRef[]; +const char create_triggerRef[]; +const char create_typeRef[]; +const char create_userRef[]; +const char create_viewRef[]; +const char crossRef[]; +const char cume_distRef[]; +const char dataflowRef[]; +const char dblRef[]; void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); -const char *decompressRef; +const char decompressRef[]; int defConstant(MalBlkPtr mb, int type, ValPtr cst); -const char *defineRef; +const char defineRef[]; void delArgument(InstrPtr p, int varid); -const char *deleteRef; +const char deleteRef[]; void deleteSymbol(Module scope, Symbol prg); -const char *deltaRef; -const char *dense_rankRef; -const char *dependRef; -const char *deregisterRef; +const char deltaRef[]; +const char dense_rankRef[]; +const char dependRef[]; +const char deregisterRef[]; malType destinationType(MalBlkPtr mb, InstrPtr p); -const char *dictRef; -const char *diffRef; -const char *diffcandRef; -const char *differenceRef; -const char *disconnectRef; -const char *divRef; -const char *drop_constraintRef; -const char *drop_functionRef; -const char *drop_indexRef; -const char *drop_roleRef; -const char *drop_schemaRef; -const char *drop_seqRef; -const char *drop_tableRef; -const char *drop_triggerRef; -const char *drop_typeRef; -const char *drop_userRef; -const char *drop_viewRef; +const char dictRef[]; +const char diffRef[]; +const char diffcandRef[]; +const char differenceRef[]; +const char disconnectRef[]; +const char divRef[]; +const char drop_constraintRef[]; +const char drop_functionRef[]; +const char drop_indexRef[]; +const char drop_roleRef[]; +const char drop_schemaRef[]; +const char drop_seqRef[]; +const char drop_tableRef[]; +const char drop_triggerRef[]; +const char drop_typeRef[]; +const char drop_userRef[]; +const char drop_viewRef[]; void dumpModules(stream *out); -const char *emptybindRef; -const char *emptybindidxRef; -const char *endsWithRef; -const char *eqRef; -const char *evalRef; -const char *execRef; -const char *exportOperationRef; -const char *export_bin_columnRef; -const char *export_tableRef; +const char emptybindRef[]; +const char emptybindidxRef[]; +const char endsWithRef[]; +const char eqRef[]; +const char evalRef[]; +const char execRef[]; +const char exportOperationRef[]; +const char export_bin_columnRef[]; +const char export_tableRef[]; str fcnDefinition(MalBlkPtr mb, InstrPtr p, str t, int flg, str base, size_t len); -const char *fetchRef; +const char fetchRef[]; int findGDKtype(int type); Module findModule(Module scope, const char *name); -const char *findRef; +const char findRef[]; Scenario findScenario(const char *nme); Symbol findSymbol(Module usermodule, const char *mod, const char *fcn); Symbol findSymbolInModule(Module v, const char *fcn); int findVariable(MalBlkPtr mb, const char *name); int findVariableLength(MalBlkPtr mb, const char *name, int len); _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org