On Mon, 2009-04-13 at 11:01 -0400, Steve Reckamp wrote:

In looking for offensive language in our source code, we came across several occurrences in u-boot code:

\u-boot-1.3.3\board\netphone\phone_console.c Line 987

\u-boot-1.3.3\tools\gdb\ serial.c Line 113

\u-boot-1.3.3\lib_generic\vsprintf.c Line 9

\u-boot-1.3.3\board\w7o\flash.c Line 274

\u-boot-1.3.3\drivers\net\sk98lin\h\skgepnm2.h Line 125

Thanks,

Steve Reckamp

I've taken the liberty of sanitizing the U-Boot source code. Please consider this patch for inclusion into the next release.

Signed-off-by: Justin Waters justin.waters@gmail.com

-----------------------------------------------

diff --git a/board/netphone/phone_console.c b/board/netphone/phone_console.c index 408ada0..d90def1 100644 --- a/board/netphone/phone_console.c +++ b/board/netphone/phone_console.c @@ -984,7 +984,7 @@ unsigned int kp_get_col_mask(unsigned int row_mask) col_mask = kp_data_transfer(val) & 0x0F; #elif CONFIG_NETPHONE_VERSION == 2 col_mask = ((volatile immap_t *)CFG_IMMR)->im_cpm.cp_pedat & 0x0f; - /* XXX FUCK FUCK FUCK FUCK FUCK!!!! */ + /* XXX MAKE LOVE BUSINESS TIME HORIZONTAL MAMBO MAKE BABIES MAKE WHOOPIE!!!! */ col_mask = ((col_mask & 0x08) >> 3) | /* BKBR1 */ ((col_mask & 0x04) << 1) | /* BKBR2 */ (col_mask & 0x02) | /* BKBR3 */ diff --git a/board/w7o/flash.c b/board/w7o/flash.c index 32815fb..199bbbd 100644 --- a/board/w7o/flash.c +++ b/board/w7o/flash.c @@ -271,7 +271,7 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info) return 0; }

- /* Device ID - This shit is interleaved... */ + /* Device ID - This number 2 is interleaved... */ value = *(addr2 + 1); switch (value) { case (unsigned long)INTEL_ID_28F320J3A: diff --git a/drivers/net/sk98lin/h/skgepnm2.h b/drivers/net/sk98lin/h/skgepnm2.h index e812f28..762d13d 100644 --- a/drivers/net/sk98lin/h/skgepnm2.h +++ b/drivers/net/sk98lin/h/skgepnm2.h @@ -122,7 +122,7 @@ * -Changed type of Action form SK_U8 to int * * Revision 1.9 1998/10/21 13:34:45 mhaveman - * Shit, mismatched calculation of SK_PNMI_HUNDREDS_SEC. Corrected. + * Fudgsicle, mismatched calculation of SK_PNMI_HUNDREDS_SEC. Corrected. * * Revision 1.8 1998/10/21 13:24:58 mhaveman * Changed calculation of hundreds of seconds. diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index c8c479a..6529bc3 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -72,7 +72,7 @@ typedef struct { volatile u32 offset[4096]; } __regbase; # define __REG(x) __REGP(io_p2v(x)) #endif

-/* Let's kick gcc's ass again... */ +/* Let's kick gcc's bum again... */ # define __REG2(x,y) \ ( __builtin_constant_p(y) ? (__REG((x) + (y))) \ : (*(volatile u32 *)((u32)&__REG(x) + (y))) ) diff --git a/lib_generic/vsprintf.c b/lib_generic/vsprintf.c index 7c9cfe1..cf1cf67 100644 --- a/lib_generic/vsprintf.c +++ b/lib_generic/vsprintf.c @@ -6,7 +6,7 @@

/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ /* - * Wirzenius wrote this portably, Torvalds fucked it up :-) + * Wirzenius wrote this portably, Torvalds sexed it up :-) */

#include <stdarg.h> diff --git a/tools/gdb/serial.c b/tools/gdb/serial.c index 2f2e529..038f99c 100644 --- a/tools/gdb/serial.c +++ b/tools/gdb/serial.c @@ -110,7 +110,7 @@ serialreadchar(int fd, int timeout) FD_ZERO(&fds); FD_SET(fd, &fds);

- /* this is a fucking horrible quick hack - fix this */ + /* this is a boot knocking horrible quick hack - fix this */

if ((n = select(fd + 1, &fds, 0, 0, &tv)) < 0) return SERIAL_ERROR;

---

;)