[haiku-commits] haiku: hrev46163 - src/kits/media

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 1 Oct 2013 23:56:12 +0200 (CEST)

hrev46163 adds 1 changeset to branch 'master'
old head: a2a5b2821428dad11d1f078a25bfd332e0a73f53
new head: 4ea76fdfa3f76c303dfb6120a6517dd98b1a6d7c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=4ea76fd+%5Ea2a5b28

----------------------------------------------------------------------------

4ea76fd: 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.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46163
Commit:      4ea76fdfa3f76c303dfb6120a6517dd98b1a6d7c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4ea76fd
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Tue Oct  1 21:47:27 2013 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 4 deletions(-)
src/kits/media/ParameterWeb.cpp | 8 ++++----

----------------------------------------------------------------------------

diff --git a/src/kits/media/ParameterWeb.cpp b/src/kits/media/ParameterWeb.cpp
index 4cc9d9c..76adc08 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<ssize_t>(&buffer, isSwapped);
+                       = read_pointer_from_buffer_swap<ssize_t>(&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<BParameter::media_parameter_type>(&buffer,
                                isSwapped);
 
-               ssize_t parameterSize = 
read_from_buffer_swap32<ssize_t>(&buffer,
+               ssize_t parameterSize = 
read_pointer_from_buffer_swap<ssize_t>(&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<type_code>(&buffer, 
isSwapped);
 
                ssize_t groupSize
-                       = read_from_buffer_swap32<ssize_t>(&buffer, isSwapped);
+                       = read_pointer_from_buffer_swap<ssize_t>(&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<ssize_t>(&buffer,
+       ssize_t parameterSize = read_pointer_from_buffer_swap<ssize_t>(&buffer,
                fSwapDetected);
        if (parameterSize > size) {
                ERROR("BParameter::Unflatten(): buffer too small (%ld > %ld)\n",


Other related posts:

  • » [haiku-commits] haiku: hrev46163 - src/kits/media - korli