From 4ea76fdfa3f76c303dfb6120a6517dd98b1a6d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 1 Oct 2013 23:47:27 +0200 Subject: [PATCH] x86_64: ssize_t is arch specific, reuse read_pointer_from_buffer_swap() ... instead of read_from_buffer_swap32. The function could be renamed. found with GCC 4.8. --- src/kits/media/ParameterWeb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kits/media/ParameterWeb.cpp b/src/kits/media/ParameterWeb.cpp index 4cc9d9c99a..76adc082ab 100644 --- a/src/kits/media/ParameterWeb.cpp +++ b/src/kits/media/ParameterWeb.cpp @@ -613,7 +613,7 @@ BParameterWeb::Unflatten(type_code code, const void* buffer, ssize_t size) for (int32 i = 0; i < count; i++) { ssize_t groupSize - = read_from_buffer_swap32(&buffer, isSwapped); + = read_pointer_from_buffer_swap(&buffer, isSwapped); if (groupSize > size_left(size, bufferStart, buffer)) { ERROR("BParameterWeb::Unflatten(): buffer too small\n"); return B_BAD_DATA; @@ -1085,7 +1085,7 @@ BParameterGroup::Unflatten(type_code code, const void* buffer, ssize_t size) = read_from_buffer_swap32(&buffer, isSwapped); - ssize_t parameterSize = read_from_buffer_swap32(&buffer, + ssize_t parameterSize = read_pointer_from_buffer_swap(&buffer, isSwapped); if (parameterSize > size_left(size, bufferStart, buffer)) return B_BAD_VALUE; @@ -1133,7 +1133,7 @@ BParameterGroup::Unflatten(type_code code, const void* buffer, ssize_t size) type_code type = read_from_buffer_swap32(&buffer, isSwapped); ssize_t groupSize - = read_from_buffer_swap32(&buffer, isSwapped); + = read_pointer_from_buffer_swap(&buffer, isSwapped); if (groupSize > size_left(size, bufferStart, buffer)) return B_BAD_VALUE; @@ -1638,7 +1638,7 @@ BParameter::Unflatten(type_code code, const void* buffer, ssize_t size) return B_BAD_TYPE; } - ssize_t parameterSize = read_from_buffer_swap32(&buffer, + ssize_t parameterSize = read_pointer_from_buffer_swap(&buffer, fSwapDetected); if (parameterSize > size) { ERROR("BParameter::Unflatten(): buffer too small (%ld > %ld)\n",