perl 5.8.2 from CPAN

1 files changed, 45 insertions, 46 deletions

diff --git a/gnu/usr.bin/perl/win32/fcrypt.c b/gnu/usr.bin/perl/win32/fcrypt.c
index ec689e57dfc..85590dac169 100644
--- a/gnu/usr.bin/perl/win32/fcrypt.c
+++ b/gnu/usr.bin/perl/win32/fcrypt.c
@@ -40,7 +40,7 @@ typedef struct des_ks_struct
 			 *((c)++)=(unsigned char)(((l)>>24)&0xff))
 
 static unsigned long SPtrans[8][64]={
-{ /* nibble 0 */
+/* nibble 0 */
 0x00820200, 0x00020000, 0x80800000, 0x80820200,
 0x00800000, 0x80020200, 0x80020000, 0x80800000,
 0x80020200, 0x00820200, 0x00820000, 0x80000200,
@@ -56,8 +56,8 @@ static unsigned long SPtrans[8][64]={
 0x80820200, 0x00020200, 0x00820000, 0x80800200,
 0x00800000, 0x80000200, 0x80020000, 0x00000000,
 0x00020000, 0x00800000, 0x80800200, 0x00820200,
-0x80000000, 0x80820000, 0x00000200, 0x80020200},
-{ /* nibble 1 */
+0x80000000, 0x80820000, 0x00000200, 0x80020200,
+/* nibble 1 */
 0x10042004, 0x00000000, 0x00042000, 0x10040000,
 0x10000004, 0x00002004, 0x10002000, 0x00042000,
 0x00002000, 0x10040004, 0x00000004, 0x10002000,
@@ -73,8 +73,8 @@ static unsigned long SPtrans[8][64]={
 0x10042000, 0x00002000, 0x00000000, 0x10000004,
 0x00000004, 0x10042004, 0x00042000, 0x10040000,
 0x10040004, 0x00040000, 0x00002004, 0x10002000,
-0x10002004, 0x00000004, 0x10040000, 0x00042000},
-{ /* nibble 2 */
+0x10002004, 0x00000004, 0x10040000, 0x00042000,
+/* nibble 2 */
 0x41000000, 0x01010040, 0x00000040, 0x41000040,
 0x40010000, 0x01000000, 0x41000040, 0x00010040,
 0x01000040, 0x00010000, 0x01010000, 0x40000000,
@@ -90,8 +90,8 @@ static unsigned long SPtrans[8][64]={
 0x40010040, 0x41000000, 0x01000000, 0x41010040,
 0x00010000, 0x01000040, 0x41000040, 0x00010040,
 0x01000040, 0x00000000, 0x41010000, 0x40000040,
-0x41000000, 0x40010040, 0x00000040, 0x01010000},
-{ /* nibble 3 */
+0x41000000, 0x40010040, 0x00000040, 0x01010000,
+/* nibble 3 */
 0x00100402, 0x04000400, 0x00000002, 0x04100402,
 0x00000000, 0x04100000, 0x04000402, 0x00100002,
 0x04100400, 0x04000002, 0x04000000, 0x00000402,
@@ -107,8 +107,8 @@ static unsigned long SPtrans[8][64]={
 0x04000000, 0x04100402, 0x00100402, 0x00100000,
 0x04100402, 0x00000002, 0x04000400, 0x00100402,
 0x00100002, 0x00100400, 0x04100000, 0x04000402,
-0x00000402, 0x04000000, 0x04000002, 0x04100400},
-{ /* nibble 4 */
+0x00000402, 0x04000000, 0x04000002, 0x04100400,
+/* nibble 4 */
 0x02000000, 0x00004000, 0x00000100, 0x02004108,
 0x02004008, 0x02000100, 0x00004108, 0x02004000,
 0x00004000, 0x00000008, 0x02000008, 0x00004100,
@@ -124,8 +124,8 @@ static unsigned long SPtrans[8][64]={
 0x02000108, 0x00000100, 0x00000000, 0x02004108,
 0x02004008, 0x02004100, 0x00000108, 0x00004000,
 0x00004100, 0x02004008, 0x02000100, 0x00000108,
-0x00000008, 0x00004108, 0x02004000, 0x02000008},
-{ /* nibble 5 */
+0x00000008, 0x00004108, 0x02004000, 0x02000008,
+/* nibble 5 */
 0x20000010, 0x00080010, 0x00000000, 0x20080800,
 0x00080010, 0x00000800, 0x20000810, 0x00080000,
 0x00000810, 0x20080810, 0x00080800, 0x20000000,
@@ -141,8 +141,8 @@ static unsigned long SPtrans[8][64]={
 0x20080810, 0x00080800, 0x00080000, 0x20000810,
 0x20000010, 0x20080000, 0x00080810, 0x00000000,
 0x00000800, 0x20000010, 0x20000810, 0x20080800,
-0x20080000, 0x00000810, 0x00000010, 0x20080010},
-{ /* nibble 6 */
+0x20080000, 0x00000810, 0x00000010, 0x20080010,
+/* nibble 6 */
 0x00001000, 0x00000080, 0x00400080, 0x00400001,
 0x00401081, 0x00001001, 0x00001080, 0x00000000,
 0x00400000, 0x00400081, 0x00000081, 0x00401000,
@@ -158,8 +158,8 @@ static unsigned long SPtrans[8][64]={
 0x00000000, 0x00400081, 0x00400080, 0x00001080,
 0x00000081, 0x00001000, 0x00401081, 0x00400000,
 0x00401080, 0x00000001, 0x00001001, 0x00401081,
-0x00400001, 0x00401080, 0x00401000, 0x00001001},
-{ /* nibble 7 */
+0x00400001, 0x00401080, 0x00401000, 0x00001001,
+/* nibble 7 */
 0x08200020, 0x08208000, 0x00008020, 0x00000000,
 0x08008000, 0x00200020, 0x08200000, 0x08208020,
 0x00000020, 0x08000000, 0x00208000, 0x00008020,
@@ -175,10 +175,9 @@ static unsigned long SPtrans[8][64]={
 0x08208020, 0x00200000, 0x08200000, 0x08000020,
 0x00208000, 0x00008020, 0x08008020, 0x08200000,
 0x00000020, 0x08208000, 0x00208020, 0x00000000,
-0x08000000, 0x08200020, 0x00008000, 0x00208020}
-};
+0x08000000, 0x08200020, 0x00008000, 0x00208020};
 static unsigned long skb[8][64]={
-{ /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
 0x00000000,0x00000010,0x20000000,0x20000010,
 0x00010000,0x00010010,0x20010000,0x20010010,
 0x00000800,0x00000810,0x20000800,0x20000810,
@@ -194,8 +193,8 @@ static unsigned long skb[8][64]={
 0x00080020,0x00080030,0x20080020,0x20080030,
 0x00090020,0x00090030,0x20090020,0x20090030,
 0x00080820,0x00080830,0x20080820,0x20080830,
-0x00090820,0x00090830,0x20090820,0x20090830},
-{ /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+0x00090820,0x00090830,0x20090820,0x20090830,
+/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
 0x00000000,0x02000000,0x00002000,0x02002000,
 0x00200000,0x02200000,0x00202000,0x02202000,
 0x00000004,0x02000004,0x00002004,0x02002004,
@@ -211,8 +210,8 @@ static unsigned long skb[8][64]={
 0x10000400,0x12000400,0x10002400,0x12002400,
 0x10200400,0x12200400,0x10202400,0x12202400,
 0x10000404,0x12000404,0x10002404,0x12002404,
-0x10200404,0x12200404,0x10202404,0x12202404},
-{ /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+0x10200404,0x12200404,0x10202404,0x12202404,
+/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
 0x00000000,0x00000001,0x00040000,0x00040001,
 0x01000000,0x01000001,0x01040000,0x01040001,
 0x00000002,0x00000003,0x00040002,0x00040003,
@@ -228,8 +227,8 @@ static unsigned long skb[8][64]={
 0x08000200,0x08000201,0x08040200,0x08040201,
 0x09000200,0x09000201,0x09040200,0x09040201,
 0x08000202,0x08000203,0x08040202,0x08040203,
-0x09000202,0x09000203,0x09040202,0x09040203},
-{ /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+0x09000202,0x09000203,0x09040202,0x09040203,
+/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
 0x00000000,0x00100000,0x00000100,0x00100100,
 0x00000008,0x00100008,0x00000108,0x00100108,
 0x00001000,0x00101000,0x00001100,0x00101100,
@@ -245,8 +244,8 @@ static unsigned long skb[8][64]={
 0x04020000,0x04120000,0x04020100,0x04120100,
 0x04020008,0x04120008,0x04020108,0x04120108,
 0x04021000,0x04121000,0x04021100,0x04121100,
-0x04021008,0x04121008,0x04021108,0x04121108},
-{ /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+0x04021008,0x04121008,0x04021108,0x04121108,
+/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
 0x00000000,0x10000000,0x00010000,0x10010000,
 0x00000004,0x10000004,0x00010004,0x10010004,
 0x20000000,0x30000000,0x20010000,0x30010000,
@@ -262,8 +261,8 @@ static unsigned long skb[8][64]={
 0x00101000,0x10101000,0x00111000,0x10111000,
 0x00101004,0x10101004,0x00111004,0x10111004,
 0x20101000,0x30101000,0x20111000,0x30111000,
-0x20101004,0x30101004,0x20111004,0x30111004},
-{ /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+0x20101004,0x30101004,0x20111004,0x30111004,
+/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
 0x00000000,0x08000000,0x00000008,0x08000008,
 0x00000400,0x08000400,0x00000408,0x08000408,
 0x00020000,0x08020000,0x00020008,0x08020008,
@@ -279,8 +278,8 @@ static unsigned long skb[8][64]={
 0x02000001,0x0A000001,0x02000009,0x0A000009,
 0x02000401,0x0A000401,0x02000409,0x0A000409,
 0x02020001,0x0A020001,0x02020009,0x0A020009,
-0x02020401,0x0A020401,0x02020409,0x0A020409},
-{ /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+0x02020401,0x0A020401,0x02020409,0x0A020409,
+/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
 0x00000000,0x00000100,0x00080000,0x00080100,
 0x01000000,0x01000100,0x01080000,0x01080100,
 0x00000010,0x00000110,0x00080010,0x00080110,
@@ -296,8 +295,8 @@ static unsigned long skb[8][64]={
 0x00200200,0x00200300,0x00280200,0x00280300,
 0x01200200,0x01200300,0x01280200,0x01280300,
 0x00200210,0x00200310,0x00280210,0x00280310,
-0x01200210,0x01200310,0x01280210,0x01280310},
-{ /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+0x01200210,0x01200310,0x01280210,0x01280310,
+/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
 0x00000000,0x04000000,0x00040000,0x04040000,
 0x00000002,0x04000002,0x00040002,0x04040002,
 0x00002000,0x04002000,0x00042000,0x04042000,
@@ -313,7 +312,7 @@ static unsigned long skb[8][64]={
 0x00000820,0x04000820,0x00040820,0x04040820,
 0x00000822,0x04000822,0x00040822,0x04040822,
 0x00002820,0x04002820,0x00042820,0x04042820,
-0x00002822,0x04002822,0x00042822,0x04042822}
+0x00002822,0x04002822,0x00042822,0x04042822,
 };
 
 /* See ecb_encrypt.c for a pseudo description of these macros. */
@@ -336,10 +335,10 @@ static int body(
 static int
 des_set_key(des_cblock *key, des_key_schedule schedule)
 	{
-	unsigned long c,d,t,s;
-	unsigned char *in;
-	unsigned long *k;
-	int i;
+	register unsigned long c,d,t,s;
+	register unsigned char *in;
+	register unsigned long *k;
+	register int i;
 
 	k=(unsigned long *)schedule;
 	in=(unsigned char *)key;
@@ -468,7 +467,7 @@ char *
 des_fcrypt(const char *buf, const char *salt, char *buff)
 	{
 	unsigned int i,j,x,y;
-	unsigned long Eswap0,Eswap1;
+	unsigned long Eswap0=0,Eswap1=0;
 	unsigned long out[2],ll;
 	des_cblock key;
 	des_key_schedule ks;
@@ -484,16 +483,16 @@ des_fcrypt(const char *buf, const char *salt, char *buff)
 	 * crypt to "*".  This was found when replacing the crypt in
 	 * our shared libraries.  People found that the disbled
 	 * accounts effectivly had no passwd :-(. */
-	x=buff[0]=((salt[0] == '\0')?(char)'A':salt[0]);
+	x=buff[0]=((salt[0] == '\0')?'A':salt[0]);
 	Eswap0=con_salt[x];
-	x=buff[1]=((salt[1] == '\0')?(char)'A':salt[1]);
+	x=buff[1]=((salt[1] == '\0')?'A':salt[1]);
 	Eswap1=con_salt[x]<<4;
 
 	for (i=0; i<8; i++)
 		{
 		c= *(buf++);
 		if (!c) break;
-		key[i]=(char)(c<<1);
+		key[i]=(c<<1);
 		}
 	for (; i<8; i++)
 		key[i]=0;
@@ -533,13 +532,13 @@ body(	unsigned long *out0,
 	unsigned long Eswap0,
 	unsigned long Eswap1)
 	{
-	unsigned long l,r,t,u,v;
+	register unsigned long l,r,t,u,v;
 #ifdef ALT_ECB
-	unsigned char *des_SP=(unsigned char *)SPtrans;
+	register unsigned char *des_SP=(unsigned char *)SPtrans;
 #endif
-	unsigned long *s;
-	int i,j;
-	unsigned long E0,E1;
+	register unsigned long *s;
+	register int i,j;
+	register unsigned long E0,E1;
 
 	l=0;
 	r=0;