[libcamera-devel] [PATCH 04/12] android: camera_buffer: Drop 'const' from buffer_handle_t

[Jacopo Mondi]

The buffer_handle_t type is defined as 'const native_handle_t*'.
Drop the 'const' specifier from the parameter of the CameraBuffer
class constructor and in the Android generic memory backend.

Also rename 'camera3buffer' in 'camera3Buffer' to comply with the
coding style guidelines.

Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/android/camera_buffer.h               |  2 +-
 src/android/mm/android_generic_buffer.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index 00b061502d6e..0590cd84652b 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -14,7 +14,7 @@
 class CameraBuffer : public libcamera::MappedBuffer
 {
 public:
-	CameraBuffer(const buffer_handle_t camera3buffer, int flags);
+	CameraBuffer(buffer_handle_t camera3Buffer, int flags);
 	~CameraBuffer();
 };
 
diff --git a/src/android/mm/android_generic_buffer.cpp b/src/android/mm/android_generic_buffer.cpp
index 6f41215bb0f9..807304a9e42d 100644
--- a/src/android/mm/android_generic_buffer.cpp
+++ b/src/android/mm/android_generic_buffer.cpp
@@ -13,16 +13,16 @@ using namespace libcamera;
 
 LOG_DECLARE_CATEGORY(HAL)
 
-CameraBuffer::CameraBuffer(const buffer_handle_t camera3buffer, int flags)
+CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags)
 {
-	maps_.reserve(camera3buffer->numFds);
+	maps_.reserve(camera3Buffer->numFds);
 	error_ = 0;
 
-	for (int i = 0; i < camera3buffer->numFds; i++) {
-		if (camera3buffer->data[i] == -1)
+	for (int i = 0; i < camera3Buffer->numFds; i++) {
+		if (camera3Buffer->data[i] == -1)
 			continue;
 
-		off_t length = lseek(camera3buffer->data[i], 0, SEEK_END);
+		off_t length = lseek(camera3Buffer->data[i], 0, SEEK_END);
 		if (length < 0) {
 			error_ = -errno;
 			LOG(HAL, Error) << "Failed to query plane length";
@@ -30,7 +30,7 @@ CameraBuffer::CameraBuffer(const buffer_handle_t camera3buffer, int flags)
 		}
 
 		void *address = mmap(nullptr, length, flags, MAP_SHARED,
-				     camera3buffer->data[i], 0);
+				     camera3Buffer->data[i], 0);
 		if (address == MAP_FAILED) {
 			error_ = -errno;
 			LOG(HAL, Error) << "Failed to mmap plane";
-- 
2.30.0