Module Name: src
Committed By: isaki
Date: Sat Jul 25 07:06:12 UTC 2015
Modified Files:
src/sys/lib/libsa: bootp.c cread.c loadfile_elf32.c
Log Message:
white space -> tab.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/lib/libsa/bootp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libsa/cread.c
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libsa/loadfile_elf32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/bootp.c
diff -u src/sys/lib/libsa/bootp.c:1.39 src/sys/lib/libsa/bootp.c:1.40
--- src/sys/lib/libsa/bootp.c:1.39 Thu Mar 20 20:42:37 2014
+++ src/sys/lib/libsa/bootp.c Sat Jul 25 07:06:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bootp.c,v 1.39 2014/03/20 20:42:37 christos Exp $ */
+/* $NetBSD: bootp.c,v 1.40 2015/07/25 07:06:11 isaki Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -393,7 +393,7 @@ vend_rfc1048(u_char *cp, u_int len)
/* let it override bp_siaddr */
(void)memcpy(&rootip.s_addr, cp, sizeof(rootip.s_addr));
}
- if (tag == TAG_ROOTPATH && size < sizeof(rootpath)) {
+ if (tag == TAG_ROOTPATH && size < sizeof(rootpath)) {
strncpy(rootpath, (char *)cp, sizeof(rootpath));
rootpath[size] = '\0';
}
Index: src/sys/lib/libsa/cread.c
diff -u src/sys/lib/libsa/cread.c:1.26 src/sys/lib/libsa/cread.c:1.27
--- src/sys/lib/libsa/cread.c:1.26 Sun Oct 13 20:09:02 2013
+++ src/sys/lib/libsa/cread.c Sat Jul 25 07:06:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cread.c,v 1.26 2013/10/13 20:09:02 joerg Exp $ */
+/* $NetBSD: cread.c,v 1.27 2015/07/25 07:06:11 isaki Exp $ */
/*
* Copyright (c) 1996
@@ -103,15 +103,15 @@ crc32(uint32_t crc, const uint8_t *const
crc = 0xffffffffU ^ crc;
for (i = 0; i < len; i++) {
- c = buf[i];
- for (j = 0; j < 8; j++) {
- carry = ((crc & 0x01) ? 1 : 0) ^ (c & 0x01);
- crc >>= 1;
- c >>= 1;
- if (carry) {
- crc = (crc ^ ETHER_CRC_POLY_LE);
+ c = buf[i];
+ for (j = 0; j < 8; j++) {
+ carry = ((crc & 0x01) ? 1 : 0) ^ (c & 0x01);
+ crc >>= 1;
+ c >>= 1;
+ if (carry) {
+ crc = (crc ^ ETHER_CRC_POLY_LE);
+ }
}
- }
}
return (crc ^ 0xffffffffU);
}
Index: src/sys/lib/libsa/loadfile_elf32.c
diff -u src/sys/lib/libsa/loadfile_elf32.c:1.30 src/sys/lib/libsa/loadfile_elf32.c:1.31
--- src/sys/lib/libsa/loadfile_elf32.c:1.30 Wed Nov 27 17:33:03 2013
+++ src/sys/lib/libsa/loadfile_elf32.c Sat Jul 25 07:06:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_elf32.c,v 1.30 2013/11/27 17:33:03 jakllsch Exp $ */
+/* $NetBSD: loadfile_elf32.c,v 1.31 2015/07/25 07:06:11 isaki Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -457,24 +457,24 @@ ELFNAMEEND(loadfile)(int fd, Elf_Ehdr *e
* table.
*/
for (first = 1, i = 0; i < elf->e_shnum; i++) {
- if (i == elf->e_shstrndx) {
- /* already loaded this section */
- continue;
+ if (i == elf->e_shstrndx) {
+ /* already loaded this section */
+ continue;
}
switch (shp[i].sh_type) {
case SHT_PROGBITS:
- if (boot_load_ctf && shstr) {
+ if (boot_load_ctf && shstr) {
/* got a CTF section? */
if (strncmp(".SUNW_ctf",
- &shstr[shp[i].sh_name],
- 10) == 0) {
- goto havesym;
+ &shstr[shp[i].sh_name],
+ 10) == 0) {
+ goto havesym;
}
}
/* Not loading this, so zero out the offset. */
shp[i].sh_offset = 0;
- break;
+ break;
case SHT_STRTAB:
for (j = 0; j < elf->e_shnum; j++)
if (shp[j].sh_type == SHT_SYMTAB &&
@@ -535,8 +535,8 @@ ELFNAMEEND(loadfile)(int fd, Elf_Ehdr *e
ELF_NOTE_TYPE_NETBSD_TAG &&
memcmp(note.name, ELF_NOTE_NETBSD_NAME,
sizeof(note.name)) == 0) {
- memcpy(&netbsd_version, ¬e.desc,
- sizeof(netbsd_version));
+ memcpy(&netbsd_version, ¬e.desc,
+ sizeof(netbsd_version));
}
shp[i].sh_offset = 0;
break;
