From 3789cdd9df9f04051d8ff0cdd760bd74ec334343 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 5 May 2016 18:44:41 -0500 Subject: [PATCH] test --- iguana/iguana_instantdex.c | 4 ++-- iguana/iguana_peers.c | 4 ++-- iguana/iguana_ramchain.c | 8 ++++---- iguana/iguana_rpc.c | 2 +- iguana/iguana_spendvectors.c | 2 +- iguana/iguana_txidfind.c | 2 +- iguana/iguana_unspents.c | 2 +- iguana/iguana_volatiles.c | 4 ++-- iguana/pangea_api.c | 4 ++-- iguana/swaps/iguana_BTCswap.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c index 00078e61c..d1a579cf8 100755 --- a/iguana/iguana_instantdex.c +++ b/iguana/iguana_instantdex.c @@ -943,7 +943,7 @@ char *instantdex_gotoffer(struct supernet_info *myinfo,struct exchange_info *exc printf("%02x ",((uint8_t *)&otherap->offer)[i]); printf("gotoffer.%llu\n",(long long)otherap->orderid); } - printf(">>>>>>>>> GOTOFFER T.%d got (%s/%s) %.8f vol %.8f %llu offerside.%d offerdir.%d decksize.%ld/datalen.%d\n",bits256_cmp(traderpub,myinfo->myaddr.persistent),myap->offer.base,myap->offer.rel,dstr(myap->offer.price64),dstr(myap->offer.basevolume64),(long long)myap->orderid,myap->offer.myside,myap->offer.acceptdir,sizeof(swap->deck),serdatalen); + printf(">>>>>>>>> GOTOFFER T.%d got (%s/%s) %.8f vol %.8f %llu offerside.%d offerdir.%d decksize.%d/datalen.%d\n",bits256_cmp(traderpub,myinfo->myaddr.persistent),myap->offer.base,myap->offer.rel,dstr(myap->offer.price64),dstr(myap->offer.basevolume64),(long long)myap->orderid,myap->offer.myside,myap->offer.acceptdir,(int32_t)sizeof(swap->deck),serdatalen); if ( exchange == 0 ) return(clonestr("{\"error\":\"instantdex_BTCswap null exchange ptr\"}")); if ( (altcoin= iguana_coinfind(myap->offer.base)) == 0 || coinbtc == 0 ) @@ -1063,7 +1063,7 @@ char *InstantDEX_hexmsg(struct supernet_info *myinfo,struct category_info *cat,v else if ( (signerbits= acct777_validate(&msg->sig,acct777_msgprivkey(serdata,datalen),msg->sig.pubkey)) != 0 )//|| 1 ) { flag++; - printf("InstantDEX_hexmsg <<<<<<<<<<<<< sigsize.%ld VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",sizeof(msg->sig),(long)serdata-(long)msg,datalen,msg->sig.timestamp,msg->sig.allocsize,(char *)msg->serialized,serdata[datalen-1]); + printf("InstantDEX_hexmsg <<<<<<<<<<<<< sigsize.%d VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",(int32_t)sizeof(msg->sig),(long)serdata-(long)msg,datalen,msg->sig.timestamp,msg->sig.allocsize,(char *)msg->serialized,serdata[datalen-1]); newlen = (int32_t)(msg->sig.allocsize - ((long)msg->serialized - (long)msg)); serdata = msg->serialized; //printf("newlen.%d diff.%ld alloc.%d datalen.%d\n",newlen,((long)msg->serialized - (long)msg),msg->sig.allocsize,datalen); diff --git a/iguana/iguana_peers.c b/iguana/iguana_peers.c index d8886553c..74243e12f 100755 --- a/iguana/iguana_peers.c +++ b/iguana/iguana_peers.c @@ -196,7 +196,7 @@ uint32_t iguana_rwiAddrind(struct iguana_info *coin,int32_t rwflag,struct iguana //printf("r %p status.%d ipbits.%x ind.%d saved iA->ind.%d retval.%d\n",iA,iA->status,(uint32_t)iA->ipbits,ind,iA->hh.itemind,retval); } } - } else printf("iAddr: error seeking.[%d] %ld vs %ld\n",ind,ftell(fp),ind * sizeof(*iA)); + } else printf("iAddr: error seeking.[%d] %ld vs %d\n",ind,ftell(fp),(int32_t)(ind * sizeof(*iA))); fclose(fp); } } @@ -236,7 +236,7 @@ uint32_t iguana_rwiAddrind(struct iguana_info *coin,int32_t rwflag,struct iguana //printf("%s status.%d lastkilled.%u ipbits.%x ind.%d saved iA->ind.%d retval.%d numiAddrs.%d\n",ipaddr,iA->status,iA->lastkilled,(uint32_t)ipbits,ind,iA->hh.itemind,retval,coin->numiAddrs); } } - } else printf("iAddr: error seeking.[%d] %ld vs %ld\n",ind,ftell(fp),ind * sizeof(*iA)); + } else printf("iAddr: error seeking.[%d] %ld vs %d\n",ind,ftell(fp),(int32_t)(ind * sizeof(*iA))); fclose(fp); } else diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index ff47cb72e..d0eb9b27f 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -166,7 +166,7 @@ uint32_t iguana_ramchain_addtxid(struct iguana_info *coin,RAMCHAIN_FUNC,bits256 { uint32_t txidind; struct iguana_txid *t; struct iguana_kvitem *ptr; if ( sizeof(*t) != 64 ) - printf("sizeof iguana_txid.%ld != 64?\n",sizeof(*t)); + printf("sizeof iguana_txid.%d != 64?\n",(int32_t)sizeof(*t)); txidind = ramchain->H.txidind; t = &T[txidind]; if ( ramchain->H.ROflag != 0 ) @@ -971,7 +971,7 @@ int64_t iguana_ramchain_saveaction(char *fname,RAMCHAIN_FUNC,FILE *fp,struct igu { int32_t i; for (i=0; i size.%ld %ld vs %ld %u\n",(int32_t)rdata->Koffset,(long)Kspace-(long)rdata,sizeof(*rdata),rdata->numtxids,rdata->numunspents,rdata->numspends,rdata->numpkinds,rdata->numexternaltxids,(long)rdata->allocsize,(long)iguana_ramchain_size(fname,RAMCHAIN_ARG,numblocks,scriptspace),after-before+sizeof(*rdata),scriptspace); + printf(" SAVEACTION: K.%d:%ld rdata.%d DEST T.%d U.%d S.%d P.%d X.%d -> size.%ld %ld vs %ld %u\n",(int32_t)rdata->Koffset,(long)Kspace-(long)rdata,(int32_t)sizeof(*rdata),rdata->numtxids,rdata->numunspents,rdata->numspends,rdata->numpkinds,rdata->numexternaltxids,(long)rdata->allocsize,(long)iguana_ramchain_size(fname,RAMCHAIN_ARG,numblocks,scriptspace),after-before+sizeof(*rdata),scriptspace); } //printf("before.%ld after.%ld allocsize.%ld [%ld] %ld expanded.%d\n",before,after,(long)srcdata->allocsize,(long)ramchain->H.data->allocsize,(long)iguana_ramchain_size(ramchain),ramchain->expanded); return(after - before); @@ -1363,7 +1363,7 @@ int32_t iguana_ramchain_extras(struct iguana_info *coin,struct iguana_ramchain * { if ( (ramchain->hashmem= hashmem) != 0 ) iguana_memreset(hashmem); - else printf("alloc ramchain->A %ld\n",sizeof(struct iguana_account) * ramchain->H.data->numpkinds); + else printf("alloc ramchain->A %d\n",(int32_t)(sizeof(struct iguana_account) * ramchain->H.data->numpkinds)); ramchain->A = (hashmem != 0 && hashmem->ptr != 0) ? iguana_memalloc(hashmem,sizeof(struct iguana_account) * ramchain->H.data->numpkinds,1) : mycalloc('p',ramchain->H.data->numpkinds,sizeof(struct iguana_account)); ramchain->Uextras = (hashmem != 0 && hashmem->ptr != 0) ? iguana_memalloc(hashmem,sizeof(*ramchain->Uextras) * ramchain->H.data->numunspents,1) : mycalloc('p',ramchain->H.data->numunspents,sizeof(*ramchain->Uextras)); } else err = iguana_volatilesmap(coin,ramchain); @@ -1884,7 +1884,7 @@ long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,stru origtxdata->block.issued = 0; return(-1); } //else printf("matched merkle.%d\n",txn_count); - } else printf("not enough memory for merkle verify %ld vs %lu\n",sizeof(bits256)*(txn_count+1),(long)addr->TXDATA.totalsize); + } else printf("not enough memory for merkle verify %d vs %lu\n",(int32_t)(sizeof(bits256)*(txn_count+1)),(long)addr->TXDATA.totalsize); bp = 0, bundlei = -2; if ( iguana_bundlefind(coin,&bp,&bundlei,origtxdata->block.RO.hash2) == 0 ) { diff --git a/iguana/iguana_rpc.c b/iguana/iguana_rpc.c index 53829e600..e4dc0bfc7 100755 --- a/iguana/iguana_rpc.c +++ b/iguana/iguana_rpc.c @@ -808,7 +808,7 @@ char *SuperNET_rpcparse(struct supernet_info *myinfo,char *retbuf,int32_t bufsiz { printf("call htmlstr\n"); if ( (filestr= SuperNET_htmlstr("index7778.html",retbuf,bufsize,0)) != 0 ) - printf("created index7778.html size %ld\n",strlen(filestr)); + printf("created index7778.html size %d\n",(int32_t)strlen(filestr)); else printf("got null filestr\n"); } if ( filestr != 0 ) diff --git a/iguana/iguana_spendvectors.c b/iguana/iguana_spendvectors.c index 22bb2387d..f63a71c1c 100755 --- a/iguana/iguana_spendvectors.c +++ b/iguana/iguana_spendvectors.c @@ -71,7 +71,7 @@ int32_t iguana_spendvectorsave(struct iguana_info *coin,struct iguana_bundle *bp if ( (fp= fopen(fname,"wb")) != 0 ) { if ( fwrite(sha256.bytes,1,sizeof(sha256),fp) != sizeof(sha256) ) - printf("error writing hash for %ld -> (%s)\n",sizeof(*ptr) * emit,fname); + printf("error writing hash for %d -> (%s)\n",(int32_t)(sizeof(*ptr) * emit),fname); else if ( fwrite(ptr,sizeof(*ptr),emit,fp) != emit ) printf("error writing %d of %d -> (%s)\n",emit,n,fname); else diff --git a/iguana/iguana_txidfind.c b/iguana/iguana_txidfind.c index 7fd5fe8a9..6c934163a 100755 --- a/iguana/iguana_txidfind.c +++ b/iguana/iguana_txidfind.c @@ -479,7 +479,7 @@ uint32_t iguana_fastfindinit(struct iguana_info *coin) } else { - printf("size error num.%d tablesize.%d -> %lu vs %ld\n",num,tablesize,(num+1)*16 + tablesize*sizeof(*hashtable),coin->fastsizes[i]); + printf("size error num.%d tablesize.%d -> %u vs %ld\n",num,tablesize,(int32_t)((num+1)*16 + tablesize*sizeof(*hashtable)),coin->fastsizes[i]); break; } } diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index 848660784..861f6434a 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -216,7 +216,7 @@ int64_t iguana_pkhashbalance(struct supernet_info *myinfo,struct iguana_info *co } unspentind = U2[unspentind].prevunspentind; } - if ( fabs(spent - checkval - RTspend) > SMALLVAL ) + if ( llabs(spent - checkval - RTspend) > SMALLVAL ) printf("spend %s: [%d] deposits %.8f spent %.8f check %.8f (%.8f) vs A2[%u] %.8f\n",lastheight==IGUANA_MAXHEIGHT?"checkerr":"",hdrsi,dstr(deposits),dstr(spent),dstr(checkval)+dstr(RTspend),dstr(*spentp),pkind,dstr(A2[pkind].total)); } (*spentp) = spent; diff --git a/iguana/iguana_volatiles.c b/iguana/iguana_volatiles.c index cf85c7301..5d616d7aa 100755 --- a/iguana/iguana_volatiles.c +++ b/iguana/iguana_volatiles.c @@ -234,7 +234,7 @@ void iguana_volatilesalloc(struct iguana_info *coin,struct iguana_ramchain *ramc { A2 = (void *)((long)ramchain->debitsfileptr + sizeof(int32_t) + 2*sizeof(bits256)); if ( ramchain->debitsfilesize != sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*A2)*rdata->numpkinds ) - printf("A2 size mismatch %ld != %ld\n",ramchain->debitsfilesize,sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*A2)*rdata->numpkinds); + printf("A2 size mismatch %ld != %d\n",ramchain->debitsfilesize,(int32_t)(sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*A2)*rdata->numpkinds)); for (i=0; inumpkinds; i++) ramchain->A2[i] = A2[i]; } @@ -248,7 +248,7 @@ void iguana_volatilesalloc(struct iguana_info *coin,struct iguana_ramchain *ramc { U2 = (void *)((long)ramchain->lastspendsfileptr + sizeof(int32_t) + 2*sizeof(bits256)); if ( ramchain->lastspendsfilesize != sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*U2)*rdata->numunspents ) - printf("U2 size mismatch %ld != %ld\n",ramchain->lastspendsfilesize,sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*U2)*rdata->numunspents); + printf("U2 size mismatch %ld != %d\n",ramchain->lastspendsfilesize,(int32_t)(sizeof(int32_t) + 2*sizeof(bits256) + sizeof(*U2)*rdata->numunspents)); for (i=0; inumunspents; i++) ramchain->Uextras[i] = U2[i]; } diff --git a/iguana/pangea_api.c b/iguana/pangea_api.c index 25e34a89f..551def012 100755 --- a/iguana/pangea_api.c +++ b/iguana/pangea_api.c @@ -111,7 +111,7 @@ int32_t pangea_rwdata(int32_t rwflag,uint8_t *serialized,int32_t datalen,uint8_t { for (i=0; isig),(long)serialized-(long)pm,datalen,bits256_str(str,acct777_msgprivkey(serialized,datalen)),bits256_str(str2,pm->sig.pubkey)); + printf("<<<<<<<<<<<<< sigsize.%d SIG ERROR [%d] len.%d (%s + %s)\n",(int32_t)sizeof(pm->sig),(int32_t)((long)serialized-(long)pm),datalen,bits256_str(str,acct777_msgprivkey(serialized,datalen)),bits256_str(str2,pm->sig.pubkey)); } return(retstr); } diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index cacd51010..9b8a7b9d1 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -463,7 +463,7 @@ char *instantdex_choosei(struct bitcoin_swapinfo *swap,cJSON *newjson,cJSON *arg } else { - printf("invalid datalen.%d vs %ld\n",datalen,sizeof(swap->deck)); + printf("invalid datalen.%d vs %d\n",datalen,(int32_t)sizeof(swap->deck)); return(clonestr("{\"error\":\"instantdex_BTCswap offer no cut\"}")); } }