diff options
author | H. Peter Anvin <hpa@zytor.com> | 2006-06-15 16:13:54 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2006-06-15 16:13:54 -0700 |
commit | 5353ead27e66f65b1be151d1089d21dfcd1fecb1 (patch) | |
tree | 258d68818e10bfe7ec5dba81735c36e3a9692841 | |
parent | 51808a7e0f72ba03ed3f41febe8aa6b2d56e1bf2 (diff) | |
download | klibc-5353ead27e66f65b1be151d1089d21dfcd1fecb1.tar.gz |
[klibc] Stealth whitespace cleanupklibc-1.3.40
Remove stealth whitespace which has snuck in.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | usr/Kbuild | 1 | ||||
-rwxr-xr-x | usr/dash/gendeps.pl | 3 | ||||
-rw-r--r-- | usr/include/arch/arm/klibc/asmmacros.h | 2 | ||||
-rw-r--r-- | usr/kinit/ipconfig/bootp_proto.c | 2 | ||||
-rw-r--r-- | usr/kinit/nfsmount/portmap.c | 2 | ||||
-rw-r--r-- | usr/kinit/nfsroot.c | 2 | ||||
-rw-r--r-- | usr/klibc/arch/arm/__muldi3.c | 1 | ||||
-rw-r--r-- | usr/klibc/arch/arm/syscall.S | 2 | ||||
-rw-r--r-- | usr/klibc/arch/arm/vfork.S | 2 | ||||
-rw-r--r-- | usr/klibc/arch/cris/vfork.S | 2 | ||||
-rw-r--r-- | usr/klibc/arch/i386/vfork.S | 2 | ||||
-rw-r--r-- | usr/klibc/arch/m68k/crt0.S | 4 | ||||
-rw-r--r-- | usr/klibc/arch/x86_64/vfork.S | 2 | ||||
-rw-r--r-- | usr/klibc/getopt.c | 2 | ||||
-rw-r--r-- | usr/klibc/inet/bindresvport.c | 2 | ||||
-rw-r--r-- | usr/klibc/syscalls.pl | 4 | ||||
-rw-r--r-- | usr/klibc/vsnprintf.c | 6 |
17 files changed, 19 insertions, 22 deletions
diff --git a/usr/Kbuild b/usr/Kbuild index 652dcfc2712d9..f874f51f75319 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -73,4 +73,3 @@ targets := initramfs_data.cpio.gz $(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio $(deps_initramfs) initramfs $(Q)$(ginitramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.gz.d $(call if_changed,initfs) - diff --git a/usr/dash/gendeps.pl b/usr/dash/gendeps.pl index 04a596be2c85b..2319bd1b4558f 100755 --- a/usr/dash/gendeps.pl +++ b/usr/dash/gendeps.pl @@ -20,7 +20,7 @@ while ( defined($file = readdir(DIR)) ) { while ( defined($line = <FILE>) ) { if ( $line =~ /^\s*\#\s*include\s+\"(.*)\"/ ) { $header = $1; - + if ( $build_headers{$header} ) { push(@hdrs, "\$(src)/$header"); } @@ -36,4 +36,3 @@ while ( defined($file = readdir(DIR)) ) { closedir(DIR); close(GENDEPS); - diff --git a/usr/include/arch/arm/klibc/asmmacros.h b/usr/include/arch/arm/klibc/asmmacros.h index 4ed6149e7a1c6..8a21c9429853f 100644 --- a/usr/include/arch/arm/klibc/asmmacros.h +++ b/usr/include/arch/arm/klibc/asmmacros.h @@ -26,5 +26,5 @@ (((x) & ~0xfc000003) == 0) || \ (((x) & ~0xf000000f) == 0) || \ (((x) & ~0xc000003f) == 0)) - + #endif /* _KLIBC_ASMMACROS_H */ diff --git a/usr/kinit/ipconfig/bootp_proto.c b/usr/kinit/ipconfig/bootp_proto.c index bae4b8754e290..137847c088dac 100644 --- a/usr/kinit/ipconfig/bootp_proto.c +++ b/usr/kinit/ipconfig/bootp_proto.c @@ -170,7 +170,7 @@ int bootp_recv_reply(struct netdev *dev) if (ret <= 0) return ret; - if (ret < sizeof(struct bootp_hdr) || + if (ret < sizeof(struct bootp_hdr) || bootp.op != BOOTP_REPLY || /* RFC951 7.5 */ bootp.xid != dev->bootp.xid || memcmp(bootp.chaddr, dev->hwaddr, 16)) diff --git a/usr/kinit/nfsmount/portmap.c b/usr/kinit/nfsmount/portmap.c index ccf5b363ad0f4..2f111d90a3e1d 100644 --- a/usr/kinit/nfsmount/portmap.c +++ b/usr/kinit/nfsmount/portmap.c @@ -60,7 +60,7 @@ uint32_t portmap(uint32_t server, uint32_t program, uint32_t version, uint32_t p } port = ntohl(reply.port); - + bail: DEBUG(("Port for %d/%d[%s]: %d\n", program, version, proto == IPPROTO_TCP ? "tcp" : "udp", port)); diff --git a/usr/kinit/nfsroot.c b/usr/kinit/nfsroot.c index 12ffce5edfea6..9930fd5ab401b 100644 --- a/usr/kinit/nfsroot.c +++ b/usr/kinit/nfsroot.c @@ -91,7 +91,7 @@ int mount_nfs_root(int argc, char *argv[], int flags) } else { strcpy(root, path); } - + nfs_argv[a++] = sub_client(client, root, len); DEBUG(("NFS-Root: mounting %s on %s with options \"%s\"\n", diff --git a/usr/klibc/arch/arm/__muldi3.c b/usr/klibc/arch/arm/__muldi3.c index 7266b4f7baaa6..3fdeb2b9cd097 100644 --- a/usr/klibc/arch/arm/__muldi3.c +++ b/usr/klibc/arch/arm/__muldi3.c @@ -13,4 +13,3 @@ uint64_t __muldi3(uint64_t a, uint64_t b) return v; } - diff --git a/usr/klibc/arch/arm/syscall.S b/usr/klibc/arch/arm/syscall.S index 60e495e202821..153d7237c01e0 100644 --- a/usr/klibc/arch/arm/syscall.S +++ b/usr/klibc/arch/arm/syscall.S @@ -16,7 +16,7 @@ __syscall_common: ldr r4, [sp,#16] ldr r5, [sp,#20] swi 0 -#endif +#endif cmn r0, #4096 rsbcs r2, r0, #0 ldrcs r3, 1f diff --git a/usr/klibc/arch/arm/vfork.S b/usr/klibc/arch/arm/vfork.S index 1c39bd653f43a..3b2d9f75b2e55 100644 --- a/usr/klibc/arch/arm/vfork.S +++ b/usr/klibc/arch/arm/vfork.S @@ -5,7 +5,7 @@ */ #include <asm/unistd.h> - + .type vfork,#function .globl vfork #ifndef __thumb__ diff --git a/usr/klibc/arch/cris/vfork.S b/usr/klibc/arch/cris/vfork.S index 8a591065bff2f..ccdb36ce929be 100644 --- a/usr/klibc/arch/cris/vfork.S +++ b/usr/klibc/arch/cris/vfork.S @@ -8,7 +8,7 @@ */ #include <asm/unistd.h> - + .section ".text","ax" .balign 4 .globl vfork diff --git a/usr/klibc/arch/i386/vfork.S b/usr/klibc/arch/i386/vfork.S index 90a26cd6cb656..c98ba3a8a7535 100644 --- a/usr/klibc/arch/i386/vfork.S +++ b/usr/klibc/arch/i386/vfork.S @@ -6,7 +6,7 @@ # #include <asm/unistd.h> - + .text .align 4 .globl vfork diff --git a/usr/klibc/arch/m68k/crt0.S b/usr/klibc/arch/m68k/crt0.S index 0a8aadb3c5bf0..fbf6f138fdaa1 100644 --- a/usr/klibc/arch/m68k/crt0.S +++ b/usr/klibc/arch/m68k/crt0.S @@ -18,10 +18,10 @@ _start: # Save the address of the ELF argument array move.l %a7, %d0 # Push a zero on the stack in lieu of atexit pointer - clr.l -(%sp) + clr.l -(%sp) # Push ELF argument pointer on the stack move.l %d0, -(%a7) - + jbsr __libc_init .size _start, .-_start diff --git a/usr/klibc/arch/x86_64/vfork.S b/usr/klibc/arch/x86_64/vfork.S index c942b255299a0..e1c8090af4a20 100644 --- a/usr/klibc/arch/x86_64/vfork.S +++ b/usr/klibc/arch/x86_64/vfork.S @@ -6,7 +6,7 @@ # #include <asm/unistd.h> - + .text .align 4 .globl vfork diff --git a/usr/klibc/getopt.c b/usr/klibc/getopt.c index fafeca1ec3c60..806735d790e23 100644 --- a/usr/klibc/getopt.c +++ b/usr/klibc/getopt.c @@ -28,7 +28,7 @@ int getopt(int argc, char *const *argv, const char *optstring) attempts to detect that situation by detecting if the "optstring" or "argv" argument have changed since last time we were called; if so, reinitialize the query state. */ - + if (optstring != pvt.last_optstring || argv != pvt.last_argv || optind < 1 || optind > argc) { /* optind doesn't match the current query */ diff --git a/usr/klibc/inet/bindresvport.c b/usr/klibc/inet/bindresvport.c index 8e8e293a5c65b..e22c1c22612f2 100644 --- a/usr/klibc/inet/bindresvport.c +++ b/usr/klibc/inet/bindresvport.c @@ -36,7 +36,7 @@ int bindresvport(int sd, struct sockaddr_in *sin) if (port == END_PORT) port = START_PORT; sin->sin_port = htons(port); - + ret = bind(sd, (struct sockaddr *)sin, sizeof(*sin)); if (ret != -1) break; diff --git a/usr/klibc/syscalls.pl b/usr/klibc/syscalls.pl index 8eadfbc50e217..ea9e149501a2a 100644 --- a/usr/klibc/syscalls.pl +++ b/usr/klibc/syscalls.pl @@ -83,7 +83,7 @@ if ($pass == 2) { if (!open(TYPESIZE, '<', $typesize)) { die "$0: $typesize: $!\n"; } - + binmode TYPESIZE; $len = -s TYPESIZE; @@ -123,7 +123,7 @@ if ($pass == 2) { if (!open(HAVESYS, '>', $havesyscall)) { die "$0: $havesyscall: $!\n"; } - + print HAVESYS "#ifndef _KLIBC_HAVESYSCALL_H\n"; print HAVESYS "#define _KLIBC_HAVESYSCALL_H 1\n\n"; } diff --git a/usr/klibc/vsnprintf.c b/usr/klibc/vsnprintf.c index 34554623c019a..26be7102a82da 100644 --- a/usr/klibc/vsnprintf.c +++ b/usr/klibc/vsnprintf.c @@ -372,7 +372,7 @@ int vsnprintf(char *buffer, size_t n, const char *format, va_list ap) int); break; case rank_long: - val = (uintmax_t) + val = (uintmax_t) va_arg(ap, unsigned long); break; @@ -439,7 +439,7 @@ int vsnprintf(char *buffer, size_t n, const char *format, va_list ap) { /* Output the number of characters written */ - + switch (rank) { case rank_char: *va_arg(ap, @@ -453,7 +453,7 @@ int vsnprintf(char *buffer, size_t n, const char *format, va_list ap) break; case rank_int: *va_arg(ap, - signed int *) + signed int *) = o; break; case rank_long: |