Merge pull request #383
3b5330e
use correct unsigned type (roman)59cc92b
removed some gcc warnings. mainly unused variables. (roman)
This commit is contained in:
commit
6b7be9f89b
|
@ -8,6 +8,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
#include "groestl.h"
|
#include "groestl.h"
|
||||||
#include "groestl_tables.h"
|
#include "groestl_tables.h"
|
||||||
|
|
||||||
|
@ -204,10 +205,9 @@ static void OutputTransformation(hashState *ctx) {
|
||||||
|
|
||||||
/* initialise context */
|
/* initialise context */
|
||||||
static void Init(hashState* ctx) {
|
static void Init(hashState* ctx) {
|
||||||
int i = 0;
|
|
||||||
/* allocate memory for state and data buffer */
|
/* allocate memory for state and data buffer */
|
||||||
|
|
||||||
for(;i<(SIZE512/sizeof(uint32_t));i++)
|
for(size_t i = 0; i < (SIZE512/sizeof(uint32_t)); i++)
|
||||||
{
|
{
|
||||||
ctx->chaining[i] = 0;
|
ctx->chaining[i] = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -413,7 +413,6 @@ BOOL SetLockPagesPrivilege(HANDLE hProcess, BOOL bEnable)
|
||||||
|
|
||||||
void slow_hash_allocate_state(void)
|
void slow_hash_allocate_state(void)
|
||||||
{
|
{
|
||||||
int state = 0;
|
|
||||||
if(hp_state != NULL)
|
if(hp_state != NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -2028,7 +2028,6 @@ bool Blockchain::check_tx_inputs(const transaction& tx, uint64_t* pmax_used_bloc
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool result;
|
|
||||||
if (threads > 1)
|
if (threads > 1)
|
||||||
{
|
{
|
||||||
// ND: Speedup
|
// ND: Speedup
|
||||||
|
@ -2364,7 +2363,6 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
|
||||||
uint64_t t_exists = 0;
|
uint64_t t_exists = 0;
|
||||||
uint64_t t_pool = 0;
|
uint64_t t_pool = 0;
|
||||||
uint64_t t_dblspnd = 0;
|
uint64_t t_dblspnd = 0;
|
||||||
uint64_t t_cc;
|
|
||||||
bool add_tx_to_pool = false;
|
bool add_tx_to_pool = false;
|
||||||
TIME_MEASURE_FINISH(t3);
|
TIME_MEASURE_FINISH(t3);
|
||||||
|
|
||||||
|
@ -2679,7 +2677,6 @@ bool Blockchain::cleanup_handle_incoming_blocks(bool force_sync)
|
||||||
LOG_PRINT_YELLOW("Blockchain::" << __func__, LOG_LEVEL_3);
|
LOG_PRINT_YELLOW("Blockchain::" << __func__, LOG_LEVEL_3);
|
||||||
CRITICAL_REGION_LOCAL(m_blockchain_lock);
|
CRITICAL_REGION_LOCAL(m_blockchain_lock);
|
||||||
TIME_MEASURE_START(t1);
|
TIME_MEASURE_START(t1);
|
||||||
auto height = m_db->height();
|
|
||||||
|
|
||||||
if (m_sync_counter > 0)
|
if (m_sync_counter > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -433,7 +433,6 @@ namespace cryptonote
|
||||||
if (get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id))
|
if (get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id))
|
||||||
{
|
{
|
||||||
LOG_PRINT_L2("Encrypting payment id " << payment_id);
|
LOG_PRINT_L2("Encrypting payment id " << payment_id);
|
||||||
crypto::key_derivation derivation;
|
|
||||||
crypto::public_key view_key_pub = get_destination_view_key_pub(destinations, sender_account_keys);
|
crypto::public_key view_key_pub = get_destination_view_key_pub(destinations, sender_account_keys);
|
||||||
if (view_key_pub == null_pkey)
|
if (view_key_pub == null_pkey)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue