Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
moneroexamples 2017-12-16 16:12:46 +08:00
commit 489d3dfac3
3 changed files with 4 additions and 3 deletions

View file

@ -392,6 +392,7 @@ main(int ac, const char* av[])
return xmrblocks.show_checkrawtx(raw_tx_data, action);
else if (action == "push")
return xmrblocks.show_pushrawtx(raw_tx_data, action);
return string("Provided action is neither check nor push");
});
}

View file

@ -58,7 +58,7 @@ MempoolStatus::start_mempool_status_thread()
else
{
cout << "Current network info read, ";
loop_index == 0;
loop_index = 0;
}
}

View file

@ -3129,7 +3129,7 @@ namespace xmreg
context["data_prefix"] = data_prefix;
if (!strncmp(decoded_raw_data.c_str(), KEY_IMAGE_EXPORT_FILE_MAGIC, magiclen) == 0)
if (strncmp(decoded_raw_data.c_str(), KEY_IMAGE_EXPORT_FILE_MAGIC, magiclen) != 0)
{
string error_msg = fmt::format("This does not seem to be key image export data.");
@ -3274,7 +3274,7 @@ namespace xmreg
context["data_prefix"] = data_prefix;
if (!strncmp(decoded_raw_data.c_str(), OUTPUT_EXPORT_FILE_MAGIC, magiclen) == 0)
if (strncmp(decoded_raw_data.c_str(), OUTPUT_EXPORT_FILE_MAGIC, magiclen) != 0)
{
string error_msg = fmt::format("This does not seem to be output keys export data.");