Fix format warnings in device/huawei/angler/camera
system/core/include is included in the global include path using
-isystem, which hides log format warnings when built with gcc.
Fix the warnings in preparation for switching from -isystem to -I.
Test: lunch aosp_angler-userdebug && m -j
Bug: 31492149
Change-Id: Ie75967aa30bae2e9bebbd65efe0ff570a80203fd
diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp
index 104412c..1d75233 100644
--- a/camera/QCamera2/HAL/QCamera2HWI.cpp
+++ b/camera/QCamera2/HAL/QCamera2HWI.cpp
@@ -1977,7 +1977,7 @@
mParameters.getHfrFps(pFpsRange);
streamInfo->user_buf_info.frameInterval =
(long)((1000/pFpsRange.video_max_fps) * 1000);
- CDBG_HIGH("%s: Video Batch Count = %d, interval = %d", __func__,
+ CDBG_HIGH("%s: Video Batch Count = %d, interval = %ld", __func__,
streamInfo->user_buf_info.frame_buf_cnt,
streamInfo->user_buf_info.frameInterval);
}
diff --git a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp
index c73ff13..c2523d5 100644
--- a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp
+++ b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp
@@ -2193,7 +2193,7 @@
}
}
- CDBG_HIGH("%s: written number of bytes %ld\n",
+ CDBG_HIGH("%s: written number of bytes %zd\n",
__func__, written_len);
close(file_fd);
} else {
diff --git a/camera/QCamera2/HAL/QCameraParameters.cpp b/camera/QCamera2/HAL/QCameraParameters.cpp
index 4d93682..88f21d2 100644
--- a/camera/QCamera2/HAL/QCameraParameters.cpp
+++ b/camera/QCamera2/HAL/QCameraParameters.cpp
@@ -5078,7 +5078,7 @@
m_pCapability->hfr_tbl,
m_pCapability->hfr_tbl_cnt);
set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.string());
- CDBG("HFR values %s HFR Sizes = %d", hfrValues.string(), hfrSizeValues.string());
+ CDBG("HFR values %s HFR Sizes = %s", hfrValues.string(), hfrSizeValues.string());
setHighFrameRate(CAM_HFR_MODE_OFF);
// Set Focus algorithms
@@ -5884,7 +5884,7 @@
}
}
- ALOGE("%s, invalid params, type:%d, pos: %d", __func__, type, pos);
+ ALOGE("%s, invalid params, type:%d, pos: %f", __func__, type, pos);
return BAD_VALUE;
}
@@ -8836,6 +8836,7 @@
format = m_pCapability->analysis_recommended_format;
} else {
ALOGE("%s:%d invalid analysis_recommended_format %d\n",
+ __func__, __LINE__,
m_pCapability->analysis_recommended_format);
format = mPreviewFormat;
}
diff --git a/camera/QCamera2/HAL/QCameraStream.cpp b/camera/QCamera2/HAL/QCameraStream.cpp
index 80e9831..2d197ca 100644
--- a/camera/QCamera2/HAL/QCameraStream.cpp
+++ b/camera/QCamera2/HAL/QCameraStream.cpp
@@ -117,7 +117,7 @@
*initial_reg_flag = stream->mRegFlags;
*num_bufs = stream->mNumBufs;
*bufs = stream->mBufDefs;
- CDBG_HIGH("%s: stream type: %d, mRegFlags: 0x%x, numBufs: %d",
+ CDBG_HIGH("%s: stream type: %d, mRegFlags: %p, numBufs: %d",
__func__, stream->getMyType(), stream->mRegFlags, stream->mNumBufs);
return NO_ERROR;
}
@@ -1211,8 +1211,8 @@
*num_bufs = mNumBufs;
*initial_reg_flag = regFlags;
*bufs = mBufDefs;
- CDBG_HIGH("%s: stream type: %d, mRegFlags: 0x%x, numBufs: %d",
- __func__, mStreamInfo->stream_type, regFlags, mBufDefs);
+ CDBG_HIGH("%s: stream type: %d, mRegFlags: %p, numBufs: %d",
+ __func__, mStreamInfo->stream_type, regFlags, mNumBufs);
if (mNumBufsNeedAlloc > 0) {
pthread_mutex_lock(&m_lock);
diff --git a/camera/QCamera2/HAL3/QCamera3Stream.cpp b/camera/QCamera2/HAL3/QCamera3Stream.cpp
index efd00e5..399e73d 100644
--- a/camera/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Stream.cpp
@@ -699,7 +699,7 @@
mBufDefs[index].mem_info = NULL;
} else {
- ALOGE("%s: Buffer at index %d not registered", __func__);
+ ALOGE("%s: Buffer at index %d not registered", __func__, index);
return BAD_INDEX;
}
