From 46beb55e21de61091152263b16e9e4086e4cc28d Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 25 Oct 2016 15:04:07 -0300 Subject: [PATCH] test --- src/komodo.h | 2 +- src/komodo_utils.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 0791d7db5..5abb2f7f9 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -22,7 +22,6 @@ #include #include #include -#include "komodo_utils.h" void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals); void komodo_init(); @@ -34,6 +33,7 @@ uint256 NOTARIZED_HASH,NOTARIZED_DESTTXID; pthread_mutex_t komodo_mutex; char USERPASS[1024]; uint16_t BITCOIND_PORT = 7771; +#include "komodo_utils.h" #include "komodo_bitcoind.h" #include "komodo_interest.h" #ifdef KOMODO_PAX diff --git a/src/komodo_utils.h b/src/komodo_utils.h index c299910e4..f1e70000f 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -980,12 +980,12 @@ void komodo_configfile(char *symbol,uint16_t port) if ( line[0] == '#' ) continue; //printf("line.(%s) %p %p\n",line,strstr(line,"rpcuser"),strstr(line,"rpcpassword")); - if ( (str= strstr(line,"rpcuser")) != 0 ) - rpcuser = parse_conf_line(str,"rpcuser"); - else if ( (str= strstr(line,"rpcpassword")) != 0 ) - rpcpassword = parse_conf_line(str,"rpcpassword"); - else if ( (str= strstr(line,"rpcport")) != 0 ) - rpcport = parse_conf_line(str,"rpcport"); + if ( (str= strstr(line,(char *)"rpcuser")) != 0 ) + rpcuser = parse_conf_line(str,(char *)"rpcuser"); + else if ( (str= strstr(line,(char *)"rpcpassword")) != 0 ) + rpcpassword = parse_conf_line(str,(char *)"rpcpassword"); + else if ( (str= strstr(line,(char *)"rpcport")) != 0 ) + rpcport = parse_conf_line(str,(char *)"rpcport"); } if ( rpcuser != 0 && rpcpassword != 0 ) {