Cosmetic changes.

This commit is contained in:
Arthur Britto
2012-04-08 17:19:13 -07:00
parent 746d3c7ab1
commit f84b2b3cf1
2 changed files with 11 additions and 19 deletions

View File

@@ -541,7 +541,6 @@ Json::Value RPCServer::doValidatorCreate(Json::Value& params) {
NewcoinAddress nodePublicKey; NewcoinAddress nodePublicKey;
NewcoinAddress nodePrivateKey; NewcoinAddress nodePrivateKey;
if(params.empty()) if(params.empty())
{ {
std::cerr << "Creating random validation seed." << std::endl; std::cerr << "Creating random validation seed." << std::endl;

View File

@@ -9,10 +9,9 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/range/adaptor/copied.hpp> #include <boost/range/adaptor/copied.hpp>
#include <string> #include <string>
#include <sstream>
#include <vector> #include <vector>
static const char* dictPA[2048] = { static const char* pcDict[2048] = {
"A", "ABE", "ACE", "ACT", "AD", "ADA", "ADD", "A", "ABE", "ACE", "ACT", "AD", "ADA", "ADD",
"AGO", "AID", "AIM", "AIR", "ALL", "ALP", "AM", "AMY", "AN", "ANA", "AGO", "AID", "AIM", "AIR", "ALL", "ALP", "AM", "AMY", "AN", "ANA",
"AND", "ANN", "ANT", "ANY", "APE", "APS", "APT", "ARC", "ARE", "ARK", "AND", "ANN", "ANT", "ANY", "APE", "APS", "APT", "ARC", "ARE", "ARK",
@@ -277,17 +276,13 @@ static void btoe(std::string& strHuman, const std::string& strData)
caBuffer[8] = char(p) << 6; caBuffer[8] = char(p) << 6;
std::ostringstream ossHuman; strHuman = std::string()
+ pcDict[extract(caBuffer, 0, 11)] + " "
ossHuman + pcDict[extract(caBuffer, 11, 11)] + " "
<< dictPA[extract(caBuffer, 0, 11)] << " " + pcDict[extract(caBuffer, 22, 11)] + " "
<< dictPA[extract(caBuffer, 11, 11)] << " " + pcDict[extract(caBuffer, 33, 11)] + " "
<< dictPA[extract(caBuffer, 22, 11)] << " " + pcDict[extract(caBuffer, 44, 11)] + " "
<< dictPA[extract(caBuffer, 33, 11)] << " " + pcDict[extract(caBuffer, 55, 11)];
<< dictPA[extract(caBuffer, 44, 11)] << " "
<< dictPA[extract(caBuffer, 55, 11)];
strHuman = ossHuman.str();
} }
static void insert(char *s, int x, int start, int length) static void insert(char *s, int x, int start, int length)
@@ -356,7 +351,7 @@ static int wsrch(const std::string& strWord, int iMin, int iMax)
{ {
// Have a range to search. // Have a range to search.
int iMid = iMin+(iMax-iMin)/2; int iMid = iMin+(iMax-iMin)/2;
int iDir = strWord.compare(dictPA[iMid]); int iDir = strWord.compare(pcDict[iMid]);
if (!iDir) if (!iDir)
{ {
@@ -423,7 +418,7 @@ static int etob(std::string& strData, std::vector<std::string> vsHuman)
return 1; return 1;
} }
// eng2key() assumes words must be separated by spaces only. // eng2key() convert words seperated by spaces into a 128 bit key in big-endian format.
// eng2key() returns // eng2key() returns
// 1 if succeeded // 1 if succeeded
// 0 if word not in dictionary // 0 if word not in dictionary
@@ -456,9 +451,7 @@ int eng2key(std::string& strKey, const std::string strHuman)
return rc; return rc;
} }
// key2eng() assumes string referenced by engout has at least 60 characters // key2eng() given a 128 bit key in big-endian format, convert to human.
// (4*12 + 11 spaces + '\0') of space.
// key2eng() returns pointer to engout.
void key2eng(std::string& strHuman, const std::string strKey) void key2eng(std::string& strHuman, const std::string strKey)
{ {
std::string strFirst, strSecond; std::string strFirst, strSecond;