From b9a9c9fae5be6d5690e1d76319c5b988e6e460e6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 27 Oct 2016 10:24:27 -0300
Subject: [PATCH] test

---
 src/komodo_gateway.h | 12 ++++++------
 src/komodo_utils.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index c6386d3ad..f07238d72 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -28,7 +28,7 @@ void komodo_gateway_deposits(CMutableTransaction& txNew)
 {
     struct pax_transaction *ptr; uint8_t *script,opret[10000],data[10000]; int32_t i,len=0,opretlen=0,numvouts=1;
     PENDING_KOMODO_TX = 0;
-    while ( (ptr= queue_dequeue(&DepositQ,0)) != 0 )
+    while ( (ptr= queue_dequeue(&DepositsQ,0)) != 0 )
     {
         txNew.vout.resize(numvouts+1);
         txNew.vout[numvouts].nValue = ptr->fiatoshis;
@@ -37,7 +37,7 @@ void komodo_gateway_deposits(CMutableTransaction& txNew)
         *script++ = 0x76;
         *script++ = 0xa9;
         *script++ = 20;
-        memcpy(script,rmd160,20), script += 20;
+        memcpy(script,ptr->rmd160,20), script += 20;
         *script++ = 0x88;
         *script++ = 0xac;
         for (i=0; i<32; i++)
@@ -50,7 +50,7 @@ void komodo_gateway_deposits(CMutableTransaction& txNew)
         printf(" vout.%u DEPOSIT %.8f\n",ptr->vout,(double)KOMODO_DEPOSIT/COIN);
         PENDING_KOMODO_TX += ptr->fiatoshis;
         numvouts++;
-        queue_enqueue("PENDINGS",&PendingsQ,&ptr->DL,0);
+        queue_enqueue((char *)"PENDINGS",&PendingsQ,&ptr->DL,0);
     }
     if ( numvouts > 1 )
     {
@@ -67,7 +67,7 @@ void komodo_gateway_deposits(CMutableTransaction& txNew)
 void komodo_gateway_deposit(uint64_t value,int32_t shortflag,char *symbol,uint64_t fiatoshis,uint8_t *rmd160,uint256 txid,uint16_t vout) // assetchain context
 {
     struct pax_transaction *ptr;
-    ptr = calloc(1,sizeof(*ptr));
+    ptr = (struct pax_transaction *)calloc(1,sizeof(*ptr));
     ptr->komodoshis = value;
     ptr->fiatoshis = fiatoshis;
     memcpy(ptr->symbol,symbol,3);
@@ -76,12 +76,12 @@ void komodo_gateway_deposit(uint64_t value,int32_t shortflag,char *symbol,uint64
     ptr->txid = txid;
     ptr->vout = vout;
     KOMODO_DEPOSIT += fiatoshis;
-    queue_enqueue("DEPOSITS",&DepositsQ,&ptr->DL,0);
+    queue_enqueue((char *)"DEPOSITS",&DepositsQ,&ptr->DL,0);
 }
 
 void komodo_gateway_depositremove(uint256 txid,uint16_t vout) // assetchain context
 {
-    int32_t iter; queue_t *Q;
+    int32_t iter; queue_t *Q; struct pax_transaction *ptr;
     for (iter=0; iter<2; iter++)
     {
         Q = (iter == 0) ? &DepositsQ : &PendingsQ;
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 08bd5ca38..329fd8de4 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1130,9 +1130,9 @@ void myfree(void *_ptr,long allocsize)
 
 void free_queueitem(void *itemdata)
 {
-    struct queueitem *item = (void *)((long)itemdata - sizeof(struct queueitem));
+    struct queueitem *item = (struct queueitem *)((long)itemdata - sizeof(struct queueitem));
     //printf("freeq item.%p itemdata.%p size.%d\n",item,itemdata,item->allocsize);
-    _myfree(item->type,item->allocsize,item,item->allocsize);
+    myfree(item,item->allocsize);
 }
 
 void *mycalloc(uint8_t type,int32_t n,long itemsize)