xnu-7195.101.1.tar.gz

[apple/xnu.git] / libsyscall / wrappers / string / memset.c

diff --git a/libsyscall/wrappers/string/memset.c b/libsyscall/wrappers/string/memset.c
index 82c1eb0a9125370a2e49e217fa00558bba96798a..f8fc25597b4e825244ac781784eb0738091bdbc2 100644 (file)
--- a/libsyscall/wrappers/string/memset.c
+++ b/libsyscall/wrappers/string/memset.c
@@ -33,8 +33,8 @@
 #include "strings.h"
 #include <sys/types.h>
 
 #include "strings.h"
 #include <sys/types.h>
 

-#define        wsize   sizeof(u_int)
-#define        wmask   (wsize - 1)
+#define wsize   sizeof(u_int)
+#define wmask   (wsize - 1)

 
 // n.b. this must be compiled with -fno-builtin or it might get optimized into
 // a recursive call to bzero.
 
 // n.b. this must be compiled with -fno-builtin or it might get optimized into
 // a recursive call to bzero.


@@ -42,12 +42,12 @@ __attribute__((visibility("hidden")))
 void
 _libkernel_bzero(void *dst0, size_t length)
 {
 void
 _libkernel_bzero(void *dst0, size_t length)
 {

-    return (void)_libkernel_memset(dst0, 0, length);
+       return (void)_libkernel_memset(dst0, 0, length);

 }
 
 }
 

-#define        RETURN  return (dst0)
-#define        VAL     c0
-#define        WIDEVAL c
+#define RETURN  return (dst0)
+#define VAL     c0
+#define WIDEVAL c

 
 __attribute__((visibility("hidden")))
 void *
 
 __attribute__((visibility("hidden")))
 void *


@@ -79,13 +79,13 @@ _libkernel_memset(void *dst0, int c0, size_t length)
                RETURN;
        }
 
                RETURN;
        }
 

-       if ((c = (u_char)c0) != 0) {    /* Fill the word. */
-               c = (c << 8) | c;       /* u_int is 16 bits. */
+       if ((c = (u_char)c0) != 0) {    /* Fill the word. */
+               c = (c << 8) | c;       /* u_int is 16 bits. */

 #if UINT_MAX > 0xffff
 #if UINT_MAX > 0xffff

-               c = (c << 16) | c;      /* u_int is 32 bits. */
+               c = (c << 16) | c;      /* u_int is 32 bits. */

 #endif
 #if UINT_MAX > 0xffffffff
 #endif
 #if UINT_MAX > 0xffffffff

-               c = (c << 32) | c;      /* u_int is 64 bits. */
+               c = (c << 32) | c;      /* u_int is 64 bits. */

 #endif
        }
        /* Align destination by filling in bytes. */
 #endif
        }
        /* Align destination by filling in bytes. */


@@ -106,9 +106,10 @@ _libkernel_memset(void *dst0, int c0, size_t length)
 
        /* Mop up trailing bytes, if any. */
        t = length & wmask;
 
        /* Mop up trailing bytes, if any. */
        t = length & wmask;

-       if (t != 0)
+       if (t != 0) {

                do {
                        *dst++ = VAL;
                } while (--t != 0);
                do {
                        *dst++ = VAL;
                } while (--t != 0);

+       }

        RETURN;
 }
        RETURN;
 }