Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 258058

Browse Source 
nsValueArray needs a ReplaceValueAt()
r=bsmedberg sr=alecf


git-svn-id: svn://10.0.0.236/trunk@199104 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cst%yecc.com
2006-06-06 13:26:26 +00:00
parent 9a363418a9
commit cfde75b236
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/xpcom/ds/nsValueArray.cpp
View File

@@ -199,7 +199,7 @@ PRBool nsValueArray::InsertValueAt(nsValueArrayValue aValue, nsValueArrayIndex a
NS_ASSERTION(*((PRUint32*)&mValueArray[aIndex * mBytesPerValue]) == aValue, "Lossy value array detected. Report a higher maximum upon construction!");
break;
default:
NS_ASSERTION(0, "surely you've been warned prior to this!");
NS_ERROR("surely you've been warned prior to this!");
break;
}
@@ -213,6 +213,37 @@ PRBool nsValueArray::InsertValueAt(nsValueArrayValue aValue, nsValueArrayIndex a
return retval;
}
//
// Replace the item at aIndex with aValue
// No validity checking other than index is done.
//
PRBool nsValueArray::ReplaceValueAt(nsValueArrayValue aValue, nsValueArrayIndex aIndex) {
NS_ENSURE_TRUE(aIndex < Count(), PR_FALSE);
//
// Do the assignment.
//
switch (mBytesPerValue) {
case sizeof(PRUint8):
*((PRUint8*)&mValueArray[aIndex * mBytesPerValue]) = (PRUint8)aValue;
NS_ASSERTION(*((PRUint8*)&mValueArray[aIndex * mBytesPerValue]) == aValue, "Lossy value array detected. Report a higher maximum upon construction!");
break;
case sizeof(PRUint16):
*((PRUint16*)&mValueArray[aIndex * mBytesPerValue]) = (PRUint16)aValue;
NS_ASSERTION(*((PRUint16*)&mValueArray[aIndex * mBytesPerValue]) == aValue, "Lossy value array detected. Report a higher maximum upon construction!");
break;
case sizeof(PRUint32):
*((PRUint32*)&mValueArray[aIndex * mBytesPerValue]) = (PRUint32)aValue;
NS_ASSERTION(*((PRUint32*)&mValueArray[aIndex * mBytesPerValue]) == aValue, "Lossy value array detected. Report a higher maximum upon construction!");
break;
default:
NS_ERROR("surely you've been warned prior to this!");
break;
}
return PR_TRUE;
}
//
// Remove the index from the value array.
// The array does not shrink until Compact() is invoked.