Skip to contentSkip to conversation

Pedantry.

PATCH In review David Woodhouse 3 participants 3 messages Jul 12, 2001

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Pedantry.

AFAIK "Uncompressing" is not a real word even in American. Please apply this correction.
(Yes, I'm bored today :)

Index: ./arch/arm/boot/compressed/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/arm/boot/compressed/misc.c,v retrieving revision 1.1.1.1.2.1

arch/arm/boot/compressed/misc.c +2 -2
diff -u -r1.1.1.1.2.1 misc.c
@@ -293,7 +293,7 @@
 	arch_decomp_setup();
 
 	makecrc();
-	puts("Uncompressing Linux...");
+	puts("Decompressing Linux...");
 	gunzip();
 	puts(" done, booting the kernel.\n");
 	return output_ptr;
@@ -307,7 +307,7 @@
 	output_data = output_buffer;
 
 	makecrc();
-	puts("Uncompressing Linux...");
+	puts("Decompressing Linux...");
 	gunzip();
 	puts("done.\n");
 	return 0;

Index: ./arch/i386/boot/compressed/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/i386/boot/compressed/misc.c,v retrieving revision 1.1.1.1.2.7

arch/i386/boot/compressed/misc.c +1 -1
diff -u -r1.1.1.1.2.7 misc.c
@@ -361,7 +361,7 @@
 	else setup_output_buffer_if_we_run_high(mv);
 
 	makecrc();
-	puts("Uncompressing Linux... ");
+	puts("Decompressing Linux... ");
 	gunzip();
 	puts("Ok, booting the kernel.\n");
 	if (high_loaded) close_output_buffer_if_we_run_high(mv);

Index: ./arch/ppc/boot/common/misc-simple.c
===================================================================
RCS file: /inst/cvs/linux/arch/ppc/boot/common/Attic/misc-simple.c,v retrieving revision 1.1.2.1

arch/ppc/boot/common/misc-simple.c +1 -1
diff -u -r1.1.2.1 misc-simple.c
@@ -173,7 +173,7 @@
 	if ( initrd_start > (16<<20))
 		puts("initrd_start located > 16M\n");
        
-	puts("Uncompressing Linux...");
+	puts("Decompressing Linux...");
 
 	gunzip(0, 0x400000, zimage_start, &zimage_size);
 	puts("done.\n");

Index: ./arch/ppc/boot/mbx/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/ppc/boot/mbx/Attic/misc.c,v retrieving revision 1.1.2.1

arch/ppc/boot/mbx/misc.c +1 -1
diff -u -r1.1.2.1 misc.c
@@ -258,7 +258,7 @@
 		udelay(1000);  /* 1 msec */
 	}
 	*cp = 0;
-	puts("\nUncompressing Linux...");
+	puts("\nDecompressing Linux...");
 
 	gunzip(0, 0x400000, zimage_start, &zimage_size);
 	puts("done.\n");

Index: ./arch/ppc/boot/prep/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/ppc/boot/prep/Attic/misc.c,v retrieving revision 1.1.2.3

arch/ppc/boot/prep/misc.c +1 -1
diff -u -r1.1.2.3 misc.c
@@ -397,7 +397,7 @@
 	if ( initrd_start > (16<<20))
 		puts("initrd_start located > 16M\n");
 
-	puts("Uncompressing Linux...");
+	puts("Decompressing Linux...");
 	
 	gunzip(0, 0x400000, zimage_start, &zimage_size);
 	puts("done.\n");

Index: ./arch/sh/boot/compressed/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/sh/boot/compressed/Attic/misc.c,v retrieving revision 1.1.2.2

arch/sh/boot/compressed/misc.c +1 -1
diff -u -r1.1.2.2 misc.c
@@ -232,7 +232,7 @@
 	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
 
 	makecrc();
-	puts("Uncompressing Linux... ");
+	puts("Decompressing Linux... ");
 	gunzip();
 	puts("Ok, booting the kernel.\n");
 }

Index: ./arch/cris/boot/compressed/misc.c
===================================================================
RCS file: /inst/cvs/linux/arch/cris/boot/compressed/Attic/misc.c,v retrieving revision 1.1.2.4

arch/cris/boot/compressed/misc.c +1 -1
diff -u -r1.1.2.4 misc.c
@@ -267,7 +267,7 @@
 		while(1);
 	}
 
-	puts("Uncompressing Linux...\n");
+	puts("Decompressing Linux...\n");
 	gunzip();
 	puts("Done. Now booting the kernel.\n");
 }

--
dwmw2

#1 lore raw
Quoted 1 line · David Woodhouse

AFAIK "Uncompressing" is not a real word even in American.

Depends how you parse it. With uncompress-ing, the word "uncompress" is actually a pronoun -- it is the name of the traditional uncompress program. Being a name, it does not have to be a real word. :-)

Now really, the kernel is not "compress"-ed per se, it's "zipped".

So may I suggest:

Unzipping linux.... done <grin>

cheers,
-- Jamie

#2 lore raw
In reply to David Woodhouse
Quoted 1 line · David Woodhouse

AFAIK "Uncompressing" is not a real word even in American.

Sure it is, on the grounds of established usage, and on the grounds of reasonable analogies (undo, unwrap, &c).

Signature · 1 line
/Jonathan Lundell.