Minor cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18715 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-08-30 23:00:58 +00:00
parent 190aa14f19
commit 96d67014ff
+14 -13
View File
@@ -419,21 +419,21 @@ arch_cpu_invalidate_TLB_list(addr_t pages[], int num_pages)
status_t status_t
arch_cpu_user_memcpy(void *to, const void *from, size_t size, addr_t *fault_handler) arch_cpu_user_memcpy(void *to, const void *from, size_t size, addr_t *faultHandler)
{ {
char *tmp = (char *)to; char *tmp = (char *)to;
char *s = (char *)from; char *s = (char *)from;
*fault_handler = (addr_t)&&error; *faultHandler = (addr_t)&&error;
while (size--) while (size--)
*tmp++ = *s++; *tmp++ = *s++;
*fault_handler = 0; *faultHandler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *faultHandler = 0;
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} }
@@ -441,24 +441,25 @@ error:
ssize_t ssize_t
arch_cpu_user_strlcpy(char *to, const char *from, size_t size, addr_t *faultHandler) arch_cpu_user_strlcpy(char *to, const char *from, size_t size, addr_t *faultHandler)
{ {
int from_length = 0; int fromLength = 0;
*faultHandler = (addr_t)&&error; *faultHandler = (addr_t)&&error;
if (size > 0) { if (size > 0) {
to[--size] = '\0'; to[--size] = '\0';
// copy // copy
for ( ; size; size--, from_length++, to++, from++) { for ( ; size; size--, fromLength++, to++, from++) {
if ((*to = *from) == '\0') if ((*to = *from) == '\0')
break; break;
} }
} }
// count any leftover from chars // count any leftover from chars
while (*from++ != '\0') while (*from++ != '\0') {
from_length++; fromLength++;
}
*faultHandler = 0; *faultHandler = 0;
return from_length; return fromLength;
error: error:
*faultHandler = 0; *faultHandler = 0;
@@ -467,20 +468,20 @@ error:
status_t status_t
arch_cpu_user_memset(void *s, char c, size_t count, addr_t *fault_handler) arch_cpu_user_memset(void *s, char c, size_t count, addr_t *faultHandler)
{ {
char *xs = (char *)s; char *xs = (char *)s;
*fault_handler = (addr_t)&&error; *faultHandler = (addr_t)&&error;
while (count--) while (count--)
*xs++ = c; *xs++ = c;
*fault_handler = 0; *faultHandler = 0;
return 0; return 0;
error: error:
*fault_handler = 0; *faultHandler = 0;
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
} }