From 3ab368e0810d894dcbc0971350c095049478a055 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 15 Apr 2014 14:55:53 -0700 Subject: media: use size_t for integer iterator to Vector::size() Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903 --- media/mtp/MtpDevice.cpp | 4 ++-- media/mtp/MtpServer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'media/mtp') diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp index 1df7af9..d6d5dd5 100644 --- a/media/mtp/MtpDevice.cpp +++ b/media/mtp/MtpDevice.cpp @@ -195,7 +195,7 @@ MtpDevice::MtpDevice(struct usb_device* device, int interface, MtpDevice::~MtpDevice() { close(); - for (unsigned int i = 0; i < mDeviceProperties.size(); i++) + for (size_t i = 0; i < mDeviceProperties.size(); i++) delete mDeviceProperties[i]; usb_request_free(mRequestIn1); usb_request_free(mRequestIn2); @@ -253,7 +253,7 @@ void MtpDevice::print() { ALOGI("*** FORMAT: %s\n", MtpDebug::getFormatCodeName(format)); MtpObjectPropertyList* props = getObjectPropsSupported(format); if (props) { - for (unsigned int j = 0; j < props->size(); j++) { + for (size_t j = 0; j < props->size(); j++) { MtpObjectProperty prop = (*props)[j]; MtpProperty* property = getObjectPropDesc(prop, format); if (property) { diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index 0b1f527..155f645 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -125,7 +125,7 @@ void MtpServer::addStorage(MtpStorage* storage) { void MtpServer::removeStorage(MtpStorage* storage) { Mutex::Autolock autoLock(mMutex); - for (unsigned int i = 0; i < mStorages.size(); i++) { + for (size_t i = 0; i < mStorages.size(); i++) { if (mStorages[i] == storage) { mStorages.removeAt(i); sendStoreRemoved(storage->getStorageID()); @@ -137,7 +137,7 @@ void MtpServer::removeStorage(MtpStorage* storage) { MtpStorage* MtpServer::getStorage(MtpStorageID id) { if (id == 0) return mStorages[0]; - for (unsigned int i = 0; i < mStorages.size(); i++) { + for (size_t i = 0; i < mStorages.size(); i++) { MtpStorage* storage = mStorages[i]; if (storage->getStorageID() == id) return storage; -- cgit v1.1