[haiku-commits] haiku: hrev43574 - src/system/libroot/posix/string

From: fredrik.holmqvist@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 29 Dec 2011 18:59:26 +0100 (CET)
hrev43574 adds 1 changeset to branch 'master'
old head: 114ab70975295dadb4d061cb4538dc2abc43acc5
new head: 79423142ff3dde69eeae36577ca2fbeea41829f6

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

7942314: Stylefixes as pointed out by Axel and some minor changes possible in 
cpp.
  
  No functional change.

                         [ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]

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

Revision:    hrev43574
Commit:      79423142ff3dde69eeae36577ca2fbeea41829f6
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7942314
Author:      Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date:        Thu Dec 29 17:57:20 2011 UTC

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

2 files changed, 16 insertions(+), 14 deletions(-)
src/system/libroot/posix/string/strlen.cpp  |   12 +++++++-----
src/system/libroot/posix/string/strnlen.cpp |   18 +++++++++---------

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

diff --git a/src/system/libroot/posix/string/strlen.cpp 
b/src/system/libroot/posix/string/strlen.cpp
index 1d336d1..9c88a35 100644
--- a/src/system/libroot/posix/string/strlen.cpp
+++ b/src/system/libroot/posix/string/strlen.cpp
@@ -17,20 +17,22 @@ size_t
 strlen(const char* string)
 {
        size_t length = 0;
-       uint32* valuePointer;
 
        /* Align access for four byte reads */
-       for (; (((addr_t)string + length) & 3) != 0; length++)
+       for (; (((addr_t)string + length) & 3) != 0; length++) {
                if (string[length] == '\0')
                        return length;
+       }
 
        /* Check four bytes for zero char */
-       for (valuePointer = (uint32*)(string + length);
-               LACKS_ZERO_BYTE(*valuePointer); valuePointer++);
+       uint32* valuePointer = (uint32*)(string + length);
+       for (; LACKS_ZERO_BYTE(*valuePointer); valuePointer++)
+               ;
 
        /* Find the exact length */
        for (length = ((char*)valuePointer) - string; string[length] != '\0';
-               length++);
+               length++)
+               ;
 
        return length;
 }
diff --git a/src/system/libroot/posix/string/strnlen.cpp 
b/src/system/libroot/posix/string/strnlen.cpp
index 1070c93..9b22ccb 100644
--- a/src/system/libroot/posix/string/strnlen.cpp
+++ b/src/system/libroot/posix/string/strnlen.cpp
@@ -17,23 +17,23 @@ size_t
 strnlen(const char* string, size_t count)
 {
        size_t length = 0;
-       uint32* valuePointer;
-       uint32* maxScanPosition;
-
        /* Align access for four byte reads */
-       for (; (((addr_t)string + length) & 3) != 0; length++)
+       for (; (((addr_t)string + length) & 3) != 0; length++) {
                if (length == count || string[length] == '\0')
                        return length;
+       }
 
        /* Check four bytes for zero char */
-       maxScanPosition = (uint32*)(string + count - 4);
-       for (valuePointer = (uint32*)(string + length);
-               valuePointer <= maxScanPosition && 
LACKS_ZERO_BYTE(*valuePointer);
-               valuePointer++);
+       const uint32* kMaxScanPosition = (uint32*)(string + count - 4);
+       uint32* valuePointer = (uint32*)(string + length);
+       for (; valuePointer <= kMaxScanPosition && 
LACKS_ZERO_BYTE(*valuePointer);
+               valuePointer++)
+               ;
 
        /* Find the exact length */
        for (length = ((char*)valuePointer) - string; length < count
-               && string[length] != '\0'; length++);
+               && string[length] != '\0'; length++)
+               ;
 
        return length;
 }
[haiku-commits] haiku: hrev43574 - src/system/libroot/posix/string

Other related posts:
