mirror of
https://github.com/privacore/open-source-search-engine.git
synced 2025-07-16 02:46:08 -04:00
Don't use bitwise operators on booleans.
&= doesn't provide short-circuit evaluation which seems to be the intent here.
This commit is contained in:
@ -363,8 +363,8 @@ bool HashTableT<Key_t, Val_t>::serialize(SafeBuf& sb) {
|
||||
sb += m_numSlotsUsed;
|
||||
if(m_numSlots == 0) return true;
|
||||
bool x = true;
|
||||
x &= sb.safeMemcpy((char*)m_keys, sizeof(Key_t) * m_numSlots);
|
||||
x &= sb.safeMemcpy((char*)m_vals, sizeof(Val_t) * m_numSlots);
|
||||
x = x && sb.safeMemcpy((char*)m_keys, sizeof(Key_t) * m_numSlots);
|
||||
x = x && sb.safeMemcpy((char*)m_vals, sizeof(Val_t) * m_numSlots);
|
||||
return x;
|
||||
}
|
||||
|
||||
|
@ -571,7 +571,7 @@ bool Pages::printAdminTop (SafeBuf *sb ,
|
||||
"</head>\n", s_pages[page].m_name);
|
||||
|
||||
// print bg colors
|
||||
status &= printColors ( sb, bodyJavascript);
|
||||
status = status && printColors ( sb, bodyJavascript);
|
||||
|
||||
// print form to encompass table now
|
||||
|
||||
@ -679,7 +679,7 @@ bool Pages::printAdminTop (SafeBuf *sb ,
|
||||
);
|
||||
|
||||
// collection navbar
|
||||
status&=printCollectionNavBar ( sb, page , coll, qs,s,r);
|
||||
status = status && printCollectionNavBar ( sb, page , coll, qs,s,r);
|
||||
|
||||
// count the statuses
|
||||
int32_t emptyCount = 0;
|
||||
@ -806,7 +806,7 @@ bool Pages::printAdminTop (SafeBuf *sb ,
|
||||
);
|
||||
|
||||
// print the hosts navigation bar
|
||||
status &= printHostLinks ( sb, page , coll, s->m_ip, qs );
|
||||
status = status && printHostLinks ( sb, page , coll, s->m_ip, qs );
|
||||
|
||||
sb->safePrintf("<br><br>");
|
||||
|
||||
@ -849,7 +849,7 @@ bool Pages::printAdminTop (SafeBuf *sb ,
|
||||
);
|
||||
|
||||
// print the menu links under that
|
||||
status &= printAdminLinks ( sb, page , coll , isBasic );
|
||||
status = status && printAdminLinks ( sb, page , coll , isBasic );
|
||||
|
||||
|
||||
sb->safePrintf("<br>");
|
||||
|
10
Parms.cpp
10
Parms.cpp
@ -1426,7 +1426,7 @@ bool Parms::printParms2 ( SafeBuf* sb ,
|
||||
// if not part of a complex row, just print this array right up
|
||||
if ( rowid == -1 ) {
|
||||
for ( int32_t j = 0 ; j < size ; j++ )
|
||||
status &= printParm( sb,&m_parms[i],i,
|
||||
status = status && printParm( sb,&m_parms[i],i,
|
||||
j, jend, (char *)THIS,
|
||||
coll,
|
||||
bg,nc,pd,
|
||||
@ -1449,7 +1449,7 @@ bool Parms::printParms2 ( SafeBuf* sb ,
|
||||
k < m_numParms &&
|
||||
m_parms[k].m_rowid == rowid;
|
||||
k++ ) {
|
||||
status &= printParm(sb,&m_parms[k],k,
|
||||
status = status && printParm(sb,&m_parms[k],k,
|
||||
newj,jend,(char *)THIS,coll,
|
||||
bg,nc,pd,
|
||||
format,
|
||||
@ -1714,7 +1714,7 @@ bool Parms::printParm( SafeBuf* sb,
|
||||
sb->safePrintf ( "<td colspan=2><center>"
|
||||
"<b>%s</b><br><font size=-1>",m->m_title );
|
||||
if ( pd ) {
|
||||
status &= sb->htmlEncode (m->m_desc,
|
||||
status = status && sb->htmlEncode (m->m_desc,
|
||||
strlen(m->m_desc),
|
||||
false);
|
||||
// is it required?
|
||||
@ -1738,7 +1738,7 @@ bool Parms::printParm( SafeBuf* sb,
|
||||
|
||||
// the "site list" parm has html in description
|
||||
if ( pd ) {
|
||||
status &= sb->safeStrcpy(m->m_desc);
|
||||
status = status && sb->safeStrcpy(m->m_desc);
|
||||
//status &= sb->htmlEncode (m->m_desc,
|
||||
// strlen(m->m_desc),
|
||||
// false);
|
||||
@ -1771,7 +1771,7 @@ bool Parms::printParm( SafeBuf* sb,
|
||||
}
|
||||
else {
|
||||
sb->safePrintf (" Default: ");
|
||||
status &= sb->htmlEncode (d,
|
||||
status = status && sb->htmlEncode (d,
|
||||
strlen(d),
|
||||
false);
|
||||
}
|
||||
|
2
Url.cpp
2
Url.cpp
@ -902,7 +902,7 @@ void Url::set( const char *t, int32_t tlen, bool addWWW, bool stripParams, bool
|
||||
|
||||
// Convert the domain to code points and copy it to tmpbuf to be punycoded
|
||||
for ( ; p - labelStart < labelLen; p += utf8Size( tmpBuf[tmpLen] ), tmpLen++ ) {
|
||||
labelIsAscii &= is_ascii( *p );
|
||||
labelIsAscii = labelIsAscii && is_ascii( *p );
|
||||
tmpBuf[tmpLen] = utf8Decode( p );
|
||||
if ( !tmpBuf[tmpLen] ) { // invalid char?
|
||||
tryLatin1 = true;
|
||||
|
Reference in New Issue
Block a user