Fix build warnings

Change-Id: Ifed20ea1c34426d837208b5654c180d6c359c6ec

diff --git a/audio_utils/spdif/AC3FrameScanner.cpp b/audio_utils/spdif/AC3FrameScanner.cpp
index ffbedb5..3a2cbff 100644 (file)
--- a/audio_utils/spdif/AC3FrameScanner.cpp
+++ b/audio_utils/spdif/AC3FrameScanner.cpp
@@ -195,7 +195,7 @@ bool AC3FrameScanner::parseHeader()
         if (fscod == 3) {
             uint32_t fscod2 = (mHeaderBuffer[4] >> 4) & 0x03;
             if (fscod2 >= AC3_NUM_SAMPLE_RATE_TABLE_ENTRIES) {
-                ALOGW("Invalid EAC3 fscod2 = %d\n", fscod2);
+                ALOGW("Invalid EAC3 fscod2 = %d", fscod2);
                 return false;
             } else {
                 mSampleRate = kEAC3ReducedSampleRateTable[fscod2];
@@ -224,10 +224,10 @@ bool AC3FrameScanner::parseHeader()
         uint32_t frmsizcod = mHeaderBuffer[4] & 0x3F; // frame size code
 
         if (fscod >= AC3_NUM_SAMPLE_RATE_TABLE_ENTRIES) {
-            ALOGW("Invalid AC3 sampleRateCode = %d\n", fscod);
+            ALOGW("Invalid AC3 sampleRateCode = %d", fscod);
             return false;
         } else if (frmsizcod >= AC3_NUM_FRAME_SIZE_TABLE_ENTRIES) {
-            ALOGW("Invalid AC3 frameSizeCode = %d\n", frmsizcod);
+            ALOGW("Invalid AC3 frameSizeCode = %d", frmsizcod);
             return false;
         } else {
             mSampleRate = kAC3SampleRateTable[fscod];
@@ -238,7 +238,7 @@ bool AC3FrameScanner::parseHeader()
         mAudioBlocksPerSyncFrame = 6;
     }
     ALOGI_IF((mFormatDumpCount == 0),
-            "AC3 frame rate = %d * %d, size = %d, audioBlocksPerSyncFrame = %d\n",
+            "AC3 frame rate = %d * %d, size = %zu, audioBlocksPerSyncFrame = %d",
             mSampleRate, mRateMultiplier, mFrameSizeBytes, mAudioBlocksPerSyncFrame);
     mFormatDumpCount++;
     return true;

diff --git a/audio_utils/spdif/DTSFrameScanner.cpp b/audio_utils/spdif/DTSFrameScanner.cpp
index f1fc356..944f4a7 100644 (file)
--- a/audio_utils/spdif/DTSFrameScanner.cpp
+++ b/audio_utils/spdif/DTSFrameScanner.cpp
@@ -81,12 +81,12 @@ bool DTSFrameScanner::parseHeader()
 
     // These variables are named after the fields in the DTS spec 5.3.1
     // Extract field in order.
-    uint32_t ftype = parser.readBits(1);
-    uint32_t deficit = parser.readBits(5); // "short"
+    (void) /* uint32_t ftype = */ parser.readBits(1);
+    (void) /* uint32_t deficit = */ parser.readBits(5); // "short"
     uint32_t cpf = parser.readBits(1);
     uint32_t nblks = parser.readBits(7);
     uint32_t fsize = parser.readBits(14);
-    uint32_t amode = parser.readBits(6);
+    (void) /* uint32_t amode = */ parser.readBits(6);
     uint32_t sfreq = parser.readBits(4);
     // make sure we did not read past collected data
     ALOG_ASSERT((mSyncLength + ((parser.getBitCursor() + 7) >> 3))
@@ -129,7 +129,7 @@ bool DTSFrameScanner::parseHeader()
 
     mRateMultiplier = 1; // TODO what about "frequency extension"?
     ALOGI_IF((mFormatDumpCount == 0),
-            "DTS frame rate = %d * %d, size = %d\n",
+            "DTS frame rate = %d * %d, size = %zu",
             mSampleRate, mRateMultiplier, mFrameSizeBytes);
     mFormatDumpCount++;
     return true;

diff --git a/audio_utils/spdif/FrameScanner.cpp b/audio_utils/spdif/FrameScanner.cpp
index 80c1d94..2b591e3 100644 (file)
--- a/audio_utils/spdif/FrameScanner.cpp
+++ b/audio_utils/spdif/FrameScanner.cpp
@@ -51,7 +51,7 @@ FrameScanner::~FrameScanner()
 bool FrameScanner::scan(uint8_t byte)
 {
     bool result = false;
-    ALOGV("FrameScanner: byte = 0x%02X, mCursor = %d\n", byte, mCursor);
+    ALOGV("FrameScanner: byte = 0x%02X, mCursor = %d", byte, mCursor);
     assert(mCursor < sizeof(mHeaderBuffer));
     if (mCursor < mSyncLength) {
         // match sync word

diff --git a/audio_utils/spdif/SPDIFEncoder.cpp b/audio_utils/spdif/SPDIFEncoder.cpp
index 2eeeba6..7e921c3 100644 (file)
--- a/audio_utils/spdif/SPDIFEncoder.cpp
+++ b/audio_utils/spdif/SPDIFEncoder.cpp
@@ -63,7 +63,7 @@ SPDIFEncoder::SPDIFEncoder(audio_format_t format)
             * SPDIF_ENCODED_CHANNEL_COUNT
             * mFramer->getMaxSampleFramesPerSyncFrame();
 
-    ALOGI("SPDIFEncoder: mBurstBufferSizeBytes = %d, littleEndian = %d",
+    ALOGI("SPDIFEncoder: mBurstBufferSizeBytes = %zu, littleEndian = %d",
             mBurstBufferSizeBytes, isLittleEndian());
     mBurstBuffer = new uint16_t[mBurstBufferSizeBytes >> 1];
     clearBurstBuffer();
@@ -103,7 +103,7 @@ void SPDIFEncoder::writeBurstBufferShorts(const uint16_t *buffer, size_t numShor
     mByteCursor = (mByteCursor + 1) & ~1; // round up to even byte
     size_t bytesToWrite = numShorts * sizeof(uint16_t);
     if ((mByteCursor + bytesToWrite) > mBurstBufferSizeBytes) {
-        ALOGE("SPDIFEncoder: Burst buffer overflow!\n");
+        ALOGE("SPDIFEncoder: Burst buffer overflow!");
         reset();
         return;
     }
@@ -123,7 +123,7 @@ void SPDIFEncoder::writeBurstBufferBytes(const uint8_t *buffer, size_t numBytes)
 {
     size_t bytesToWrite = numBytes;
     if ((mByteCursor + bytesToWrite) > mBurstBufferSizeBytes) {
-        ALOGE("SPDIFEncoder: Burst buffer overflow!\n");
+        ALOGE("SPDIFEncoder: Burst buffer overflow!");
         clearBurstBuffer();
         return;
     }
@@ -224,7 +224,7 @@ ssize_t SPDIFEncoder::write( const void *buffer, size_t numBytes )
 {
     size_t bytesLeft = numBytes;
     const uint8_t *data = (const uint8_t *)buffer;
-    ALOGV("SPDIFEncoder: mScanning = %d, write(buffer[0] = 0x%02X, numBytes = %u)",
+    ALOGV("SPDIFEncoder: mScanning = %d, write(buffer[0] = 0x%02X, numBytes = %zu)",
         mScanning, (uint) *data, numBytes);
     while (bytesLeft > 0) {
         if (mScanning) {