[haiku-commits] haiku: hrev43576 - src/system/libroot/os

  • From: stpere@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 29 Dec 2011 20:16:26 +0100 (CET)

hrev43576 adds 1 changeset to branch 'master'
old head: b6e4d1a9dc2ec8dd6e5fd5a89fff62bb7409cdf9
new head: d2a423e4993cc8d6264126bad89d9ee65ea075e0

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

d2a423e: driver_settings: Replace type of bufferSize from size_t to ssize_t
  
  At various locations, checks are made so that bufferSize is >= 0, which never
  occurs. CID 4197.

                                [ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]

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

Revision:    hrev43576
Commit:      d2a423e4993cc8d6264126bad89d9ee65ea075e0
URL:         http://cgit.haiku-os.org/haiku/commit/?id=d2a423e
Author:      Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date:        Thu Dec 29 19:08:15 2011 UTC

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

1 files changed, 7 insertions(+), 7 deletions(-)
src/system/libroot/os/driver_settings.cpp |   14 +++++++-------

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

diff --git a/src/system/libroot/os/driver_settings.cpp 
b/src/system/libroot/os/driver_settings.cpp
index 5aa4c83..b62bea0 100644
--- a/src/system/libroot/os/driver_settings.cpp
+++ b/src/system/libroot/os/driver_settings.cpp
@@ -459,7 +459,7 @@ load_driver_settings_from_file(int file, const char 
*driverName)
 
 
 static bool
-put_string(char **_buffer, size_t *_bufferSize, char *string)
+put_string(char **_buffer, ssize_t *_bufferSize, char *string)
 {
        size_t length, reserved, quotes;
        char *buffer = *_buffer, c;
@@ -507,7 +507,7 @@ put_string(char **_buffer, size_t *_bufferSize, char 
*string)
 
 
 static bool
-put_chars(char **_buffer, size_t *_bufferSize, const char *chars)
+put_chars(char **_buffer, ssize_t *_bufferSize, const char *chars)
 {
        char *buffer = *_buffer;
        size_t length;
@@ -533,7 +533,7 @@ put_chars(char **_buffer, size_t *_bufferSize, const char 
*chars)
 
 
 static bool
-put_char(char **_buffer, size_t *_bufferSize, char c)
+put_char(char **_buffer, ssize_t *_bufferSize, char c)
 {
        char *buffer = *_buffer;
 
@@ -553,7 +553,7 @@ put_char(char **_buffer, size_t *_bufferSize, char c)
 
 
 static void
-put_level_space(char **_buffer, size_t *_bufferSize, int32 level)
+put_level_space(char **_buffer, ssize_t *_bufferSize, int32 level)
 {
        while (level-- > 0)
                put_char(_buffer, _bufferSize, '\t');
@@ -561,7 +561,7 @@ put_level_space(char **_buffer, size_t *_bufferSize, int32 
level)
 
 
 static void
-put_parameter(char **_buffer, size_t *_bufferSize,
+put_parameter(char **_buffer, ssize_t *_bufferSize,
        struct driver_parameter *parameter, int32 level, bool flat)
 {
        int32 i;
@@ -873,11 +873,11 @@ parse_driver_settings_string(const char *settingsString)
        the "buffer" parameter is NULL, B_BAD_VALUE is returned.
 */
 status_t
-get_driver_settings_string(void *_handle, char *buffer, size_t *_bufferSize,
+get_driver_settings_string(void *_handle, char *buffer, ssize_t *_bufferSize,
        bool flat)
 {
        settings_handle *handle = (settings_handle *)_handle;
-       size_t bufferSize = *_bufferSize;
+       ssize_t bufferSize = *_bufferSize;
        int32 i;
 
        if (!check_handle(handle) || !buffer || *_bufferSize == 0)


Other related posts: