diff options
Diffstat (limited to 'media/mtp')
| -rw-r--r-- | media/mtp/MtpDevice.cpp | 4 | ||||
| -rw-r--r-- | media/mtp/MtpServer.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp index d672dff..1df7af9 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 (int i = 0; i < mDeviceProperties.size(); i++) + for (unsigned int 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 (int j = 0; j < props->size(); j++) { + for (unsigned int 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 df87db4..0b1f527 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -20,6 +20,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <fcntl.h> +#include <inttypes.h> #include <errno.h> #include <sys/stat.h> #include <dirent.h> @@ -124,7 +125,7 @@ void MtpServer::addStorage(MtpStorage* storage) { void MtpServer::removeStorage(MtpStorage* storage) { Mutex::Autolock autoLock(mMutex); - for (int i = 0; i < mStorages.size(); i++) { + for (unsigned int i = 0; i < mStorages.size(); i++) { if (mStorages[i] == storage) { mStorages.removeAt(i); sendStoreRemoved(storage->getStorageID()); @@ -136,7 +137,7 @@ void MtpServer::removeStorage(MtpStorage* storage) { MtpStorage* MtpServer::getStorage(MtpStorageID id) { if (id == 0) return mStorages[0]; - for (int i = 0; i < mStorages.size(); i++) { + for (unsigned int i = 0; i < mStorages.size(); i++) { MtpStorage* storage = mStorages[i]; if (storage->getStorageID() == id) return storage; @@ -1110,7 +1111,7 @@ MtpResponseCode MtpServer::doSendPartialObject() { } const char* filePath = (const char *)edit->mPath; - ALOGV("receiving partial %s %lld %lld\n", filePath, offset, length); + ALOGV("receiving partial %s %lld %" PRIu32 "\n", filePath, offset, length); // read the header, and possibly some data int ret = mData.read(mFD); |