Stylefixes as pointed out by Axel and some minor changes possible in cpp.
No functional change.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user