From f1063e2659cad01ec334a265c31734c63c319cc4 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Fri, 17 Apr 2015 15:19:42 -0700 Subject: libmedia: fix all warning, make warnings errors, use clang Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff --- media/libmedia/Android.mk | 6 ++++++ media/libmedia/AudioSystem.cpp | 1 - media/libmedia/AudioTrack.cpp | 3 ++- media/libmedia/AudioTrackShared.cpp | 5 +++-- media/libmedia/CharacterEncodingDetector.cpp | 2 -- media/libmedia/IMediaLogService.cpp | 4 ++-- media/libmedia/IResourceManagerService.cpp | 3 --- media/libmedia/MediaProfiles.cpp | 1 - media/libmedia/MediaResource.cpp | 2 +- media/libmedia/MediaResourcePolicy.cpp | 2 +- media/libmedia/MemoryLeakTrackUtil.cpp | 2 +- media/libmedia/ToneGenerator.cpp | 1 - 12 files changed, 16 insertions(+), 16 deletions(-) (limited to 'media') diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 78baa43..0c18828 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -7,6 +7,9 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libmedia_helper LOCAL_MODULE_TAGS := optional +LOCAL_C_FLAGS += -Werror -Wall +LOCAL_CLANG := true + include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -84,5 +87,8 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) +LOCAL_CFLAGS += -Werror -Wall +LOCAL_CLANG := true + include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e9ee169..2ed50e8 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -477,7 +477,6 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle const void *param2) { ALOGV("ioConfigChanged() event %d", event); const OutputDescriptor *desc; - audio_stream_type_t stream; if (ioHandle == AUDIO_IO_HANDLE_NONE) return; diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 30d4355..055556f 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1663,7 +1663,8 @@ nsecs_t AudioTrack::processAudioBuffer() // AudioSystem cache. We should not exit here but after calling the callback so // that the upper layers can recreate the track if (!isOffloadedOrDirect_l() || (mSequence == mObservedSequence)) { - status_t status = restoreTrack_l("processAudioBuffer"); + status_t status __unused = restoreTrack_l("processAudioBuffer"); + // FIXME unused status // after restoration, continue below to make sure that the loop and buffer events // are notified because they have been cleared from mCblk->mFlags above. } diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index ba67b40..aee9fc2 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -619,8 +619,9 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush) // Rather than shutting down on a corrupt flush, just treat it as a full flush if (!(0 <= filled && (size_t) filled <= mFrameCount)) { ALOGE("mFlush %#x -> %#x, front %#x, rear %#x, mask %#x, newFront %#x, " - "filled %d=%#x", - mFlush, flush, front, rear, mask, newFront, filled, filled); + "filled %zd=%#x", + mFlush, flush, front, rear, + (unsigned)mask, newFront, filled, (unsigned)filled); newFront = rear; } mFlush = flush; diff --git a/media/libmedia/CharacterEncodingDetector.cpp b/media/libmedia/CharacterEncodingDetector.cpp index 41994dc..3020136 100644 --- a/media/libmedia/CharacterEncodingDetector.cpp +++ b/media/libmedia/CharacterEncodingDetector.cpp @@ -89,7 +89,6 @@ void CharacterEncodingDetector::detectAndConvert() { // try combined detection of artist/album/title etc. char buf[1024]; buf[0] = 0; - int idx; bool allprintable = true; for (int i = 0; i < size; i++) { const char *name = mNames.getEntry(i); @@ -169,7 +168,6 @@ void CharacterEncodingDetector::detectAndConvert() { const char *name = mNames.getEntry(i); uint8_t* src = (uint8_t *)mValues.getEntry(i); int len = strlen((char *)src); - uint8_t* dest = src; ALOGV("@@@ checking %s", name); const char *s = mValues.getEntry(i); diff --git a/media/libmedia/IMediaLogService.cpp b/media/libmedia/IMediaLogService.cpp index 230749e..1536337 100644 --- a/media/libmedia/IMediaLogService.cpp +++ b/media/libmedia/IMediaLogService.cpp @@ -45,7 +45,7 @@ public: data.writeStrongBinder(IInterface::asBinder(shared)); data.writeInt64((int64_t) size); data.writeCString(name); - status_t status = remote()->transact(REGISTER_WRITER, data, &reply); + status_t status __unused = remote()->transact(REGISTER_WRITER, data, &reply); // FIXME ignores status } @@ -53,7 +53,7 @@ public: Parcel data, reply; data.writeInterfaceToken(IMediaLogService::getInterfaceDescriptor()); data.writeStrongBinder(IInterface::asBinder(shared)); - status_t status = remote()->transact(UNREGISTER_WRITER, data, &reply); + status_t status __unused = remote()->transact(UNREGISTER_WRITER, data, &reply); // FIXME ignores status } diff --git a/media/libmedia/IResourceManagerService.cpp b/media/libmedia/IResourceManagerService.cpp index 95a2d1c..7ae946d 100644 --- a/media/libmedia/IResourceManagerService.cpp +++ b/media/libmedia/IResourceManagerService.cpp @@ -38,11 +38,9 @@ enum { template static void writeToParcel(Parcel *data, const Vector &items) { size_t size = items.size(); - size_t sizePosition = data->dataPosition(); // truncates size, but should be okay for this usecase data->writeUint32(static_cast(size)); for (size_t i = 0; i < size; i++) { - size_t position = data->dataPosition(); items[i].writeToParcel(data); } } @@ -121,7 +119,6 @@ status_t BnResourceManagerService::onTransact( switch (code) { case CONFIG: { CHECK_INTERFACE(IResourceManagerService, data, reply); - int pid = data.readInt32(); sp client( interface_cast(data.readStrongBinder())); Vector policies; diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 47f9258..ae0061f 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -532,7 +532,6 @@ void MediaProfiles::checkAndAddRequiredProfilesIfNecessary() { CHECK(refIndex != -1); RequiredProfileRefInfo *info; camcorder_quality refQuality; - VideoCodec *codec = NULL; // Check high and low from either camcorder profile, timelapse profile // or high speed profile, but not all of them. Default, check camcorder profile diff --git a/media/libmedia/MediaResource.cpp b/media/libmedia/MediaResource.cpp index 8be01bc..eea2c43 100644 --- a/media/libmedia/MediaResource.cpp +++ b/media/libmedia/MediaResource.cpp @@ -50,7 +50,7 @@ void MediaResource::writeToParcel(Parcel *parcel) const { String8 MediaResource::toString() const { String8 str; - str.appendFormat("%s/%s:%llu", mType.string(), mSubType.string(), mValue); + str.appendFormat("%s/%s:%llu", mType.string(), mSubType.string(), (unsigned long long)mValue); return str; } diff --git a/media/libmedia/MediaResourcePolicy.cpp b/media/libmedia/MediaResourcePolicy.cpp index 2bb996a..139a38c 100644 --- a/media/libmedia/MediaResourcePolicy.cpp +++ b/media/libmedia/MediaResourcePolicy.cpp @@ -42,7 +42,7 @@ void MediaResourcePolicy::writeToParcel(Parcel *parcel) const { String8 MediaResourcePolicy::toString() const { String8 str; - str.appendFormat("%s:%llu", mType.string(), mValue); + str.appendFormat("%s:%llu", mType.string(), (unsigned long long)mValue); return str; } diff --git a/media/libmedia/MemoryLeakTrackUtil.cpp b/media/libmedia/MemoryLeakTrackUtil.cpp index d31f721..554dbae 100644 --- a/media/libmedia/MemoryLeakTrackUtil.cpp +++ b/media/libmedia/MemoryLeakTrackUtil.cpp @@ -173,7 +173,7 @@ void dumpMemoryAddresses(int fd) #else // Does nothing -void dumpMemoryAddresses(int fd) {} +void dumpMemoryAddresses(int fd __unused) {} #endif } // namespace android diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 2cc4685..6da5348 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -984,7 +984,6 @@ void ToneGenerator::stopTone() { if ((mStartTime.tv_sec != 0) && (clock_gettime(CLOCK_MONOTONIC, &stopTime) == 0)) { time_t sec = stopTime.tv_sec - mStartTime.tv_sec; long nsec = stopTime.tv_nsec - mStartTime.tv_nsec; - long durationMs; if (nsec < 0) { --sec; nsec += 1000000000; -- cgit v1.1