Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1012814 part 2: Use size_t instead of uint32_t for nsTArray iteration, in nsTransferable.cpp. r=bjacob

Browse Source
This commit is contained in:
Daniel Holbert 2014-05-20 12:43:57 -07:00
parent a56b11e89a
commit e63fdf5095
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widget/xpwidgets/nsTransferable.cpp
View File

@ -260,7 +260,7 @@ nsTransferable::GetTransferDataFlavors(nsISupportsArray ** aDataFlavorList)
nsresult rv = NS_NewISupportsArray ( aDataFlavorList );
if (NS_FAILED(rv)) return rv;
for ( uint32_t i=0; i<mDataArray.Length(); ++i ) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
nsCOMPtr<nsISupportsCString> flavorWrapper = do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID);
if ( flavorWrapper ) {
@ -292,8 +292,7 @@ nsTransferable::GetTransferData(const char *aFlavor, nsISupports **aData, uint32
nsCOMPtr<nsISupports> savedData;
// first look and see if the data is present in one of the intrinsic flavors
uint32_t i;
for (i = 0; i < mDataArray.Length(); ++i ) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
if ( data.GetFlavor().Equals(aFlavor) ) {
nsCOMPtr<nsISupports> dataBytes;
@ -323,7 +322,7 @@ nsTransferable::GetTransferData(const char *aFlavor, nsISupports **aData, uint32
// if not, try using a format converter to get the requested flavor
if ( mFormatConv ) {
for (i = 0; i < mDataArray.Length(); ++i) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
bool canConvert = false;
mFormatConv->CanConvert(data.GetFlavor().get(), aFlavor, &canConvert);
@ -371,7 +370,7 @@ nsTransferable::GetAnyTransferData(char **aFlavor, nsISupports **aData, uint32_t
NS_ENSURE_ARG_POINTER(aFlavor && aData && aDataLen);
for ( uint32_t i=0; i < mDataArray.Length(); ++i ) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
if (data.IsDataAvailable()) {
*aFlavor = ToNewCString(data.GetFlavor());
@ -397,8 +396,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_
NS_ENSURE_ARG(aFlavor);
// first check our intrinsic flavors to see if one has been registered.
uint32_t i = 0;
for (i = 0; i < mDataArray.Length(); ++i) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
if ( data.GetFlavor().Equals(aFlavor) ) {
data.SetData ( aData, aDataLen );
@ -408,7 +406,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_
// if not, try using a format converter to find a flavor to put the data in
if ( mFormatConv ) {
for (i = 0; i < mDataArray.Length(); ++i) {
for (size_t i = 0; i < mDataArray.Length(); ++i) {
DataStruct& data = mDataArray.ElementAt(i);
bool canConvert = false;
mFormatConv->CanConvert(aFlavor, data.GetFlavor().get(), &canConvert);