This commit is contained in:
blackjok3r
2018-10-25 13:26:17 +08:00
parent d32cdefe7b
commit ed7c037303

View File

@@ -278,7 +278,6 @@ void hex2ascii(const string& in, string& out)
p++; p++;
if (p == in.end()) break; // incomplete last digit - should report error if (p == in.end()) break; // incomplete last digit - should report error
c = (c << 4) + hexval(*p); // + takes precedence over << c = (c << 4) + hexval(*p); // + takes precedence over <<
printf("char: %d\n",c);
out.push_back(c); out.push_back(c);
} }
} }
@@ -401,7 +400,7 @@ UniValue getdatafromblock(const UniValue& params, bool fHelp)
} }
std::string decodedstreamid; std::string decodedstreamid;
hex2ascii(streamid, decodedstreamid); hex2ascii(streamid, decodedstreamid);
result.push_back(Pair("streamid", decodedstreamid)); result.push_back(Pair("streamid", decodedstreamid.c_str()));
result.push_back(Pair("streamidhex", streamid)); result.push_back(Pair("streamidhex", streamid));
result.push_back(Pair("firsttxid", firsttxid)); result.push_back(Pair("firsttxid", firsttxid));
result.push_back(Pair("firstseqid", (int)firstseqid)); result.push_back(Pair("firstseqid", (int)firstseqid));