Changeset: b605277ba987 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b605277ba987 Modified Files: Branch: jacqueline Log Message:
Merged from default diffs (truncated from 693 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 @@ -621,27 +621,27 @@ str ALGprod_sht_wrd(wrd *res, int *bid, str ALGprod_wrd_dbl(dbl *res, int *bid, bit *empty_is_nil); str ALGprod_wrd_lng(lng *res, int *bid, bit *empty_is_nil); str ALGprod_wrd_wrd(wrd *res, int *bid, bit *empty_is_nil); -str ALGprojectCst(Client cntxt,MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str ALGprojectCst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ALGprojectCstBody(bat *result, int *bid, ptr *p, int tt); str ALGprojectNIL(int *ret, int *bid); -str ALGprojecthead_bit(int *ret,ptr *val, int *bid); -str ALGprojecthead_bte(int *ret,ptr *val, int *bid); -str ALGprojecthead_dbl(int *ret,ptr *val, int *bid); -str ALGprojecthead_flt(int *ret,ptr *val, int *bid); -str ALGprojecthead_int(int *ret,ptr *val, int *bid); -str ALGprojecthead_lng(int *ret,ptr *val, int *bid); -str ALGprojecthead_oid(int *ret,ptr *val, int *bid); -str ALGprojecthead_sht(int *ret,ptr *val, int *bid); -str ALGprojecthead_str(int *ret,ptr *val, int *bid); -str ALGprojecttail_bit(int *ret,int *bid, ptr *val); -str ALGprojecttail_bte(int *ret,int *bid, ptr *val); -str ALGprojecttail_dbl(int *ret,int *bid, ptr *val); -str ALGprojecttail_flt(int *ret,int *bid, ptr *val); -str ALGprojecttail_int(int *ret,int *bid, ptr *val); -str ALGprojecttail_lng(int *ret,int *bid, ptr *val); -str ALGprojecttail_oid(int *ret,int *bid, ptr *val); -str ALGprojecttail_sht(int *ret,int *bid, ptr *val); -str ALGprojecttail_str(int *ret,int *bid, ptr *val); +str ALGprojecthead_bit(int *ret, ptr *val, int *bid); +str ALGprojecthead_bte(int *ret, ptr *val, int *bid); +str ALGprojecthead_dbl(int *ret, ptr *val, int *bid); +str ALGprojecthead_flt(int *ret, ptr *val, int *bid); +str ALGprojecthead_int(int *ret, ptr *val, int *bid); +str ALGprojecthead_lng(int *ret, ptr *val, int *bid); +str ALGprojecthead_oid(int *ret, ptr *val, int *bid); +str ALGprojecthead_sht(int *ret, ptr *val, int *bid); +str ALGprojecthead_str(int *ret, ptr *val, int *bid); +str ALGprojecttail_bit(int *ret, int *bid, ptr *val); +str ALGprojecttail_bte(int *ret, int *bid, ptr *val); +str ALGprojecttail_dbl(int *ret, int *bid, ptr *val); +str ALGprojecttail_flt(int *ret, int *bid, ptr *val); +str ALGprojecttail_int(int *ret, int *bid, ptr *val); +str ALGprojecttail_lng(int *ret, int *bid, ptr *val); +str ALGprojecttail_oid(int *ret, int *bid, ptr *val); +str ALGprojecttail_sht(int *ret, int *bid, ptr *val); +str ALGprojecttail_str(int *ret, int *bid, ptr *val); str ALGrangejoin(int *result, int *lid, int *rlid, int *rhid, bit *li, bit *hi); str ALGrangesplit(int *result, int *bid, int *nfrag); str ALGreuse(int *ret, int *bid); @@ -744,13 +744,13 @@ str AUTHrequireAdminOrUser(Client *c, st str AUTHresolveUser(str *ret, oid *uid); str AUTHsetPassword(Client *c, str *username, str *passwd); str AUTHunlockVault(str *password); -str AX3aggrX3_avg3_bte(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_dbl(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_flt(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_sht(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_avg3_wrd(int *retid,int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_bte(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_dbl(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_flt(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_sht(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_avg3_wrd(int *retid, int *bid, int *gid, int *eid); str AX3aggrX3_avg_bte(int *retid, int *bid, int *eid); str AX3aggrX3_avg_dbl(int *retid, int *bid, int *eid); str AX3aggrX3_avg_flt(int *retid, int *bid, int *eid); @@ -763,28 +763,28 @@ str AX3aggrX3_count2Nils(int *retid, int str AX3aggrX3_count3(int *retid, int *bid, int *gid, int *eid, bit *ignore_nils); str AX3aggrX3_count3Nils(int *retid, int *bid, int *gid, int *eid); str AX3aggrX3_max(int *ret, int *bid, int *eid); -str AX3aggrX3_max3(int *ret,int *bid, int *gid, int *eid); +str AX3aggrX3_max3(int *ret, int *bid, int *gid, int *eid); str AX3aggrX3_min(int *ret, int *bid, int *eid); -str AX3aggrX3_min3(int *ret,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_bte_bte(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_bte_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_bte_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_bte_sht(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_bte_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_dbl_dbl(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_flt_dbl(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_flt_flt(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_int_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_int_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_int_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_lng_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_lng_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_sht_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_sht_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_sht_sht(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_sht_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_wrd_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_prod3_wrd_wrd(int *retid,int *bid, int *gid, int *eid); +str AX3aggrX3_min3(int *ret, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_bte_bte(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_bte_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_bte_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_bte_sht(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_bte_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_dbl_dbl(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_flt_dbl(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_flt_flt(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_int_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_int_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_int_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_lng_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_lng_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_sht_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_sht_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_sht_sht(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_sht_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_wrd_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_prod3_wrd_wrd(int *retid, int *bid, int *gid, int *eid); str AX3aggrX3_prod_bte_bte(int *retid, int *bid, int *eid); str AX3aggrX3_prod_bte_int(int *retid, int *bid, int *eid); str AX3aggrX3_prod_bte_lng(int *retid, int *bid, int *eid); @@ -805,25 +805,25 @@ str AX3aggrX3_prod_sht_wrd(int *retid, i str AX3aggrX3_prod_wrd_lng(int *retid, int *bid, int *eid); str AX3aggrX3_prod_wrd_wrd(int *retid, int *bid, int *eid); str AX3aggrX3_size(int *retid, int *bid, int *eid); -str AX3aggrX3_sum3_bte_bte(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_bte_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_bte_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_bte_sht(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_bte_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_dbl_dbl(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_flt_dbl(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_flt_flt(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_int_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_int_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_int_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_lng_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_lng_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_sht_int(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_sht_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_sht_sht(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_sht_wrd(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_wrd_lng(int *retid,int *bid, int *gid, int *eid); -str AX3aggrX3_sum3_wrd_wrd(int *retid,int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_bte_bte(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_bte_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_bte_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_bte_sht(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_bte_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_dbl_dbl(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_flt_dbl(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_flt_flt(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_int_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_int_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_int_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_lng_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_lng_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_sht_int(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_sht_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_sht_sht(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_sht_wrd(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_wrd_lng(int *retid, int *bid, int *gid, int *eid); +str AX3aggrX3_sum3_wrd_wrd(int *retid, int *bid, int *gid, int *eid); str AX3aggrX3_sum_bte_bte(int *retid, int *bid, int *eid); str AX3aggrX3_sum_bte_int(int *retid, int *bid, int *eid); str AX3aggrX3_sum_bte_lng(int *retid, int *bid, int *eid); @@ -3459,12 +3459,12 @@ str CMDcstADDbat_wrd_sht_lng(int *ret, v str CMDcstADDbat_wrd_sht_wrd(int *ret, void *cst, int *l); str CMDcstADDbat_wrd_wrd_lng(int *ret, void *cst, int *l); str CMDcstADDbat_wrd_wrd_wrd(int *ret, void *cst, int *l); -str CMDcstANDbat_bte_bte_bte(int *ret,void *cst, int *l); -str CMDcstANDbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstANDbat_lng_lng_lng(int *ret,void *cst, int *l); -str CMDcstANDbat_oid_oid_oid(int *ret,void *cst, int *l); -str CMDcstANDbat_sht_sht_sht(int *ret,void *cst, int *l); -str CMDcstANDbat_wrd_wrd_wrd(int *ret,void *cst, int *l); +str CMDcstANDbat_bte_bte_bte(int *ret, void *cst, int *l); +str CMDcstANDbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstANDbat_lng_lng_lng(int *ret, void *cst, int *l); +str CMDcstANDbat_oid_oid_oid(int *ret, void *cst, int *l); +str CMDcstANDbat_sht_sht_sht(int *ret, void *cst, int *l); +str CMDcstANDbat_wrd_wrd_wrd(int *ret, void *cst, int *l); str CMDcstDIVbat_bte_bte_bte(int *ret, void *cst, int *l); str CMDcstDIVbat_bte_bte_int(int *ret, void *cst, int *l); str CMDcstDIVbat_bte_bte_lng(int *ret, void *cst, int *l); @@ -3525,17 +3525,17 @@ str CMDcstDIVbat_wrd_sht_lng(int *ret, v str CMDcstDIVbat_wrd_sht_wrd(int *ret, void *cst, int *l); str CMDcstDIVbat_wrd_wrd_lng(int *ret, void *cst, int *l); str CMDcstDIVbat_wrd_wrd_wrd(int *ret, void *cst, int *l); -str CMDcstLSHbat_bte_int_bte(int *ret,void *cst, int *l); -str CMDcstLSHbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstLSHbat_lng_int_lng(int *ret,void *cst, int *l); -str CMDcstLSHbat_oid_int_oid(int *ret,void *cst, int *l); -str CMDcstLSHbat_sht_int_sht(int *ret,void *cst, int *l); -str CMDcstLSHbat_wrd_int_wrd(int *ret,void *cst, int *l); -str CMDcstMODbat_bte_bte_bte(int *ret,void *cst, int *l); -str CMDcstMODbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstMODbat_lng_lng_lng(int *ret,void *cst, int *l); -str CMDcstMODbat_sht_sht_sht(int *ret,void *cst, int *l); -str CMDcstMODbat_wrd_wrd_wrd(int *ret,void *cst, int *l); +str CMDcstLSHbat_bte_int_bte(int *ret, void *cst, int *l); +str CMDcstLSHbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstLSHbat_lng_int_lng(int *ret, void *cst, int *l); +str CMDcstLSHbat_oid_int_oid(int *ret, void *cst, int *l); +str CMDcstLSHbat_sht_int_sht(int *ret, void *cst, int *l); +str CMDcstLSHbat_wrd_int_wrd(int *ret, void *cst, int *l); +str CMDcstMODbat_bte_bte_bte(int *ret, void *cst, int *l); +str CMDcstMODbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstMODbat_lng_lng_lng(int *ret, void *cst, int *l); +str CMDcstMODbat_sht_sht_sht(int *ret, void *cst, int *l); +str CMDcstMODbat_wrd_wrd_wrd(int *ret, void *cst, int *l); str CMDcstMULbat_bte_bte_bte(int *ret, void *cst, int *l); str CMDcstMULbat_bte_bte_int(int *ret, void *cst, int *l); str CMDcstMULbat_bte_bte_lng(int *ret, void *cst, int *l); @@ -3596,18 +3596,18 @@ str CMDcstMULbat_wrd_sht_lng(int *ret, v str CMDcstMULbat_wrd_sht_wrd(int *ret, void *cst, int *l); str CMDcstMULbat_wrd_wrd_lng(int *ret, void *cst, int *l); str CMDcstMULbat_wrd_wrd_wrd(int *ret, void *cst, int *l); -str CMDcstORbat_bte_bte_bte(int *ret,void *cst, int *l); -str CMDcstORbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstORbat_lng_lng_lng(int *ret,void *cst, int *l); -str CMDcstORbat_oid_oid_oid(int *ret,void *cst, int *l); -str CMDcstORbat_sht_sht_sht(int *ret,void *cst, int *l); -str CMDcstORbat_wrd_wrd_wrd(int *ret,void *cst, int *l); -str CMDcstRSHbat_bte_int_bte(int *ret,void *cst, int *l); -str CMDcstRSHbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstRSHbat_lng_int_lng(int *ret,void *cst, int *l); -str CMDcstRSHbat_oid_int_oid(int *ret,void *cst, int *l); -str CMDcstRSHbat_sht_int_sht(int *ret,void *cst, int *l); -str CMDcstRSHbat_wrd_int_wrd(int *ret,void *cst, int *l); +str CMDcstORbat_bte_bte_bte(int *ret, void *cst, int *l); +str CMDcstORbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstORbat_lng_lng_lng(int *ret, void *cst, int *l); +str CMDcstORbat_oid_oid_oid(int *ret, void *cst, int *l); +str CMDcstORbat_sht_sht_sht(int *ret, void *cst, int *l); +str CMDcstORbat_wrd_wrd_wrd(int *ret, void *cst, int *l); +str CMDcstRSHbat_bte_int_bte(int *ret, void *cst, int *l); +str CMDcstRSHbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstRSHbat_lng_int_lng(int *ret, void *cst, int *l); +str CMDcstRSHbat_oid_int_oid(int *ret, void *cst, int *l); +str CMDcstRSHbat_sht_int_sht(int *ret, void *cst, int *l); +str CMDcstRSHbat_wrd_int_wrd(int *ret, void *cst, int *l); str CMDcstSUBbat_bte_bte_bte(int *ret, void *cst, int *l); str CMDcstSUBbat_bte_bte_int(int *ret, void *cst, int *l); str CMDcstSUBbat_bte_bte_lng(int *ret, void *cst, int *l); @@ -3668,12 +3668,12 @@ str CMDcstSUBbat_wrd_sht_lng(int *ret, v str CMDcstSUBbat_wrd_sht_wrd(int *ret, void *cst, int *l); str CMDcstSUBbat_wrd_wrd_lng(int *ret, void *cst, int *l); str CMDcstSUBbat_wrd_wrd_wrd(int *ret, void *cst, int *l); -str CMDcstXORbat_bte_bte_bte(int *ret,void *cst, int *l); -str CMDcstXORbat_int_int_int(int *ret,void *cst, int *l); -str CMDcstXORbat_lng_lng_lng(int *ret,void *cst, int *l); -str CMDcstXORbat_oid_oid_oid(int *ret,void *cst, int *l); -str CMDcstXORbat_sht_sht_sht(int *ret,void *cst, int *l); -str CMDcstXORbat_wrd_wrd_wrd(int *ret,void *cst, int *l); +str CMDcstXORbat_bte_bte_bte(int *ret, void *cst, int *l); +str CMDcstXORbat_int_int_int(int *ret, void *cst, int *l); +str CMDcstXORbat_lng_lng_lng(int *ret, void *cst, int *l); +str CMDcstXORbat_oid_oid_oid(int *ret, void *cst, int *l); +str CMDcstXORbat_sht_sht_sht(int *ret, void *cst, int *l); +str CMDcstXORbat_wrd_wrd_wrd(int *ret, void *cst, int *l); str CMDdeactivateProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDdebug(int *ret, int *flg); str CMDdumpTrace(int *res); @@ -4206,9 +4206,9 @@ str MDBtrapFunction(Client cntxt, MalBlk str MDBvar(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBvar3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MKEYbathash(bat *res, bat *bid); -str MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits,int *bid); +str MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits, int *bid); str MKEYbulkconst_rotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str MKEYconstbulk_rotate_xor_hash(int *ret, wrd *h, int *nbits,int *bid); +str MKEYconstbulk_rotate_xor_hash(int *ret, wrd *h, int *nbits, int *bid); str MKEYhash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MKEYhash_bit(wrd *ret, bit *v); str MKEYhash_bte(wrd *ret, bte *v); @@ -4865,7 +4865,7 @@ str RECYCLEdumpQPatWrap(Client cntxt, Ma str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str RECYCLEepilogue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -void RECYCLEexit(Client cntxt,MalBlkPtr mb, MalStkPtr stk, InstrPtr p, lng ticks); +void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, lng ticks); str RECYCLEgetAdmission(int *p); str RECYCLEgetCache(int *p); bte RECYCLEgetQryCat(int qidx); @@ -4877,7 +4877,7 @@ str RECYCLElog(int *d, str *nm); str RECYCLEmonitor(int *d, int *p); int RECYCLEnewQryStat(MalBlkPtr mb); str RECYCLEprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -void RECYCLEreset(Client cntxt,MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +void RECYCLEreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str RECYCLEresetCMD(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str RECYCLEsetAdmission(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str RECYCLEsetCache(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -5304,13 +5304,13 @@ str activateCounter(str name); str addPipeDefinition(str name, str pipe); str addRegWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); DCYcatalog *addRegist(str sch, str tab, str col, int acc, int part, int f_bun, int l_bun); -void addtoMalBlkHistory(MalBlkPtr mb,str marker); +void addtoMalBlkHistory(MalBlkPtr mb, str marker); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
