Fixed some bugs.

This commit is contained in:
Matt Wells 2013-08-09 08:52:15 -07:00
parent be7aab78b7
commit 76cf68f7b1
5 changed files with 8 additions and 1921 deletions

View File

@ -11178,7 +11178,7 @@ uint64_t getAddressHash ( Place *street ,
ch ^= street->m_streetNumHash;
ch ^= street->m_streetIndHash;
// adm1
char *adm1Str ;
char *adm1Str = NULL;
if ( adm1 ) adm1Str = adm1->m_adm1;
else if ( zip ) adm1Str = zip->m_adm1;
else if ( city && city->m_adm1[0] ) adm1Str = city->m_adm1;
@ -15959,7 +15959,7 @@ key128_t Address::makePlacedbKey (long long docId,bool useName1,bool useName2){
//h = hash64 ( (long long)m_adm1.m_crid , h );
// adm1
// get the two-letter state abbreviation code (nm = new mexico)
char *adm1Str ;
char *adm1Str = NULL;
if ( m_adm1 ) adm1Str = m_adm1->m_adm1;
else if ( m_zip ) adm1Str = m_zip->m_adm1;
// unique cities like "Albuquerque" imply a state
@ -15967,7 +15967,7 @@ key128_t Address::makePlacedbKey (long long docId,bool useName1,bool useName2){
else { char *xx=NULL;*xx=0; }
h = hash64 ( (long long)(*(uint16_t *)adm1Str) , h );
// city
long long cityHash ;
long long cityHash = 0LL;
if ( m_city ) cityHash = m_city->m_hash;
else if ( m_zip ) cityHash = m_zip->m_cityHash;
else { char *xx=NULL;*xx=0; }
@ -19643,7 +19643,7 @@ PlaceMem::PlaceMem() {
m_numPlacePtrs = 0;
m_numPoolPtrsAllocated = 0;
m_numPlacePtrsAllocated = 0;
m_stack = false;
m_stack = NULL;//false;
}
PlaceMem::~PlaceMem() {

View File

@ -119,7 +119,7 @@ void DailyMerge::dailyMergeLoop ( ) {
// . comma separated list is ok ("0,1, 6")
// . leave blank or at least no numbers to do every day
char *s = cr->m_dailyMergeDOWList;
char dowCounts[7];
char dowCounts[8];
memset(dowCounts,0,8);
for ( ; *s ; s++ ) {
if ( ! is_digit(*s) ) continue;

View File

@ -207,7 +207,7 @@ void printXmlDiff(Xml *xml1, Xml *xml2, DiffOpt *argOpt){
if (editLoc > lastC){
char name[1024];
name[0] = '\0';
long namelen;
long namelen = 0;
//namelen = xml1->getCompoundName
// (editLoc,name,1024);
buf.safePrintf("@@@ node %li: ",

View File

@ -690,7 +690,8 @@ bool Proxy::handleRequest (TcpSocket *s){
}
// check funds. m_pending is a positive amount, so is price.
// accountBalance is how much money they have in their acct
float cur = ui->m_accountBalance - ui->m_pending - price;
float cur = 0.0;
if ( ui ) cur = ui->m_accountBalance - ui->m_pending - price;
if ( ui && cur < 0.0 &&
// we do not use the new system to track ...
// we still need to bill them the old way

File diff suppressed because it is too large Load Diff