More C style to D style array decalaration.

mingodad · mingodad · commit 4ff753794d98 · 2014-09-27T16:16:04.000-07:00
diff --git a/deimos/openssl/aes.d b/deimos/openssl/aes.d
@@ -75,9 +75,9 @@ nothrow:
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
 version (AES_LONG) {
-    c_ulong rd_key[4* (AES_MAXNR + 1)];
+    c_ulong[4* (AES_MAXNR + 1)] rd_key;
 } else {
-    uint rd_key[4* (AES_MAXNR + 1)];
+    uint[4* (AES_MAXNR + 1)] rd_key;
 }
     int rounds;
 };
@@ -119,8 +119,8 @@ void AES_ofb128_encrypt(const(ubyte)* in_, ubyte* out_,
 	ubyte* ivec, int* num);
 void AES_ctr128_encrypt(const(ubyte)* in_, ubyte* out_,
 	size_t length, const(AES_KEY)* key,
-	ubyte ivec[AES_BLOCK_SIZE],
-	ubyte ecount_buf[AES_BLOCK_SIZE],
+	ubyte[AES_BLOCK_SIZE] ivec,
+	ubyte[AES_BLOCK_SIZE] ecount_buf,
 	uint* num);
 /* NB: the IV is _two_ blocks long */
 void AES_ige_encrypt(const(ubyte)* in_, ubyte* out_,
diff --git a/deimos/openssl/asn1t.d b/deimos/openssl/asn1t.d
@@ -148,7 +148,7 @@ nothrow:
  */
 
 #define ASN1_SEQUENCE(tname) \
-	static const ASN1_TEMPLATE tname##_seq_tt[]
+	static const ASN1_TEMPLATE[] tname##_seq_tt
 
 #define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
 
@@ -252,7 +252,7 @@ nothrow:
  */
 
 #define ASN1_CHOICE(tname) \
-	static const ASN1_TEMPLATE tname##_ch_tt[]
+	static const ASN1_TEMPLATE[] tname##_ch_tt
 
 #define ASN1_CHOICE_cb(tname, cb) \
 	static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
@@ -392,7 +392,7 @@ nothrow:
 /* Macros for the ASN1_ADB structure */
 
 #define ASN1_ADB(name) \
-	static const ASN1_ADB_TABLE name##_adbtbl[]
+	static const ASN1_ADB_TABLE[] name##_adbtbl
 
 #ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
 
diff --git a/deimos/openssl/blowfish.d b/deimos/openssl/blowfish.d
@@ -100,8 +100,8 @@ enum BF_ROUNDS = 16;
 enum BF_BLOCK = 8;
 
 struct bf_key_st {
-	BF_LONG P[BF_ROUNDS+2];
-	BF_LONG S[4*256];
+	BF_LONG[BF_ROUNDS+2] P;
+	BF_LONG[4*256] S;
 	}
 alias bf_key_st BF_KEY;
 
diff --git a/deimos/openssl/camellia.d b/deimos/openssl/camellia.d
@@ -120,6 +120,6 @@ void Camellia_ofb128_encrypt(const(ubyte)* in_, ubyte* out_,
 	ubyte* ivec, int* num);
 void Camellia_ctr128_encrypt(const(ubyte)* in_, ubyte* out_,
 	size_t length, const(CAMELLIA_KEY)* key,
-	ubyte ivec[CAMELLIA_BLOCK_SIZE],
-	ubyte ecount_buf[CAMELLIA_BLOCK_SIZE],
+	ubyte[CAMELLIA_BLOCK_SIZE] ivec,
+	ubyte[CAMELLIA_BLOCK_SIZE] ecount_buf,
 	uint* num);
diff --git a/deimos/openssl/cast_.d b/deimos/openssl/cast_.d
@@ -78,7 +78,7 @@ enum CAST_BLOCK = 8;
 enum CAST_KEY_LENGTH = 16;
 
 struct cast_key_st {
-	CAST_LONG data[32];
+	CAST_LONG[32] data;
 	int short_key;	/* Use reduced rounds for short key */
 	}
 alias cast_key_st CAST_KEY;
diff --git a/deimos/openssl/des.d b/deimos/openssl/des.d
@@ -83,7 +83,7 @@ struct DES_ks
 	DES_cblock cblock;
 	/* make sure things are correct size on machines with
 	 * 8 byte longs */
-	DES_LONG deslong[2];
+	DES_LONG[2] deslong;
 	}
 	ks_[16] ks;
     }
@@ -205,7 +205,7 @@ void DES_ofb_encrypt(const(ubyte)* in_,ubyte* out_,int numbits,
 void DES_pcbc_encrypt(const(ubyte)* input,ubyte* output,
 		      c_long length,DES_key_schedule* schedule,DES_cblock* ivec,
 		      int enc);
-DES_LONG DES_quad_cksum(const(ubyte)* input,DES_cblock output[],
+DES_LONG DES_quad_cksum(const(ubyte)* input,DES_cblock[] output,
 			c_long length,int out_count,DES_cblock* seed);
 int DES_random_key(DES_cblock* ret);
 void DES_set_odd_parity(DES_cblock* key);
diff --git a/deimos/openssl/ebcdic.d b/deimos/openssl/ebcdic.d
@@ -10,7 +10,7 @@ alias _openssl_os_toebcdic os_toebcdic;
 alias _openssl_ebcdic2ascii ebcdic2ascii;
 alias _openssl_ascii2ebcdic ascii2ebcdic;
 
-extern const ubyte _openssl_os_toascii[256];
-extern const ubyte _openssl_os_toebcdic[256];
+extern const ubyte[256] _openssl_os_toascii;
+extern const ubyte[256] _openssl_os_toebcdic;
 void* _openssl_ebcdic2ascii(void* dest, const(void)* srce, size_t count);
 void* _openssl_ascii2ebcdic(void* dest, const(void)* srce, size_t count);
diff --git a/deimos/openssl/ec.d b/deimos/openssl/ec.d
@@ -637,7 +637,7 @@ int EC_POINTs_make_affine(const(EC_GROUP)* group, size_t num, EC_POINT*[] points
  * \param  ctx    BN_CTX object (optional)
  * \return 1 on success and 0 if an error occured
  */
-int EC_POINTs_mul(const(EC_GROUP)* group, EC_POINT* r, const(BIGNUM)* n, size_t num, const(EC_POINT)* p[], const(BIGNUM)* m[], BN_CTX* ctx);
+int EC_POINTs_mul(const(EC_GROUP)* group, EC_POINT* r, const(BIGNUM)* n, size_t num, const(EC_POINT)*[] p, const(BIGNUM)*[] m, BN_CTX* ctx);
 
 /** Computes r = generator* n + q* m
  * \param  group  underlying EC_GROUP object
diff --git a/deimos/openssl/idea.d b/deimos/openssl/idea.d
@@ -76,7 +76,7 @@ extern (C):
 nothrow:
 
 struct idea_key_st {
-	IDEA_INT data[9][6];
+	IDEA_INT[9][6] data;
 	}
 alias idea_key_st IDEA_KEY_SCHEDULE;
 
diff --git a/deimos/openssl/md4.d b/deimos/openssl/md4.d
@@ -101,7 +101,7 @@ enum MD4_DIGEST_LENGTH = 16;
 struct MD4state_st {
 	MD4_LONG A,B,C,D;
 	MD4_LONG Nl,Nh;
-	MD4_LONG data[MD4_LBLOCK];
+	MD4_LONG[MD4_LBLOCK] data;
 	uint num;
 	}
 alias MD4state_st MD4_CTX;
diff --git a/deimos/openssl/md5.d b/deimos/openssl/md5.d
@@ -101,7 +101,7 @@ enum MD5_DIGEST_LENGTH = 16;
 struct MD5state_st {
 	MD5_LONG A,B,C,D;
 	MD5_LONG Nl,Nh;
-	MD5_LONG data[MD5_LBLOCK];
+	MD5_LONG[MD5_LBLOCK] data;
 	uint num;
 	}
 alias MD5state_st MD5_CTX;
diff --git a/deimos/openssl/mdc2.d b/deimos/openssl/mdc2.d
@@ -74,7 +74,7 @@ enum MDC2_DIGEST_LENGTH = 16;
  
 struct mdc2_ctx_st {
 	uint num;
-	ubyte data[MDC2_BLOCK];
+	ubyte[MDC2_BLOCK] data;
 	DES_cblock h,hh;
 	int pad_type; /* either 1 or 2, default 1 */
 	}
diff --git a/deimos/openssl/pem.d b/deimos/openssl/pem.d
@@ -179,7 +179,7 @@ struct pem_ctx_st
 	struct DEK_info_{
 		int cipher;
 	/* unused, and wrong size
-	   ubyte iv[8]; */
+	   ubyte[8] iv; */
 		}
 	DEK_info_ DEK_info;
 
@@ -200,7 +200,7 @@ struct pem_ctx_st
 	int key_len;		/* key length */
 	ubyte* key;	/* key */
 	/* unused, and wrong size
-	   ubyte iv[8]; */
+	   ubyte[8] iv; */
 
 
 	int  data_enc;		/* is the data encrypted */
diff --git a/deimos/openssl/rc2.d b/deimos/openssl/rc2.d
@@ -75,7 +75,7 @@ extern (C):
 nothrow:
 
 struct rc2_key_st {
-	RC2_INT data[64];
+	RC2_INT[64] data;
 	}
 alias rc2_key_st RC2_KEY;
 
diff --git a/deimos/openssl/rc4.d b/deimos/openssl/rc4.d
@@ -72,7 +72,7 @@ nothrow:
 
 struct rc4_key_st {
 	RC4_INT x,y;
-	RC4_INT data[256];
+	RC4_INT[256] data;
 	}
 alias rc4_key_st RC4_KEY;
 
diff --git a/deimos/openssl/ripemd.d b/deimos/openssl/ripemd.d
@@ -87,7 +87,7 @@ enum RIPEMD160_DIGEST_LENGTH = 20;
 struct RIPEMD160state_st {
 	RIPEMD160_LONG A,B,C,D,E;
 	RIPEMD160_LONG Nl,Nh;
-	RIPEMD160_LONG data[RIPEMD160_LBLOCK];
+	RIPEMD160_LONG[RIPEMD160_LBLOCK] data;
 	uint   num;
 	}
 alias RIPEMD160state_st RIPEMD160_CTX;
diff --git a/deimos/openssl/whrlpool.d b/deimos/openssl/whrlpool.d
@@ -14,14 +14,14 @@ enum WHIRLPOOL_COUNTER = (256/8);
 
 struct WHIRLPOOL_CTX {
 	union H_ {
-		ubyte	c[WHIRLPOOL_DIGEST_LENGTH];
+		ubyte[WHIRLPOOL_DIGEST_LENGTH]	c;
 		/* double q is here to ensure 64-bit alignment */
-		double		q[WHIRLPOOL_DIGEST_LENGTH/double.sizeof];
+		double[WHIRLPOOL_DIGEST_LENGTH/double.sizeof]		q;
 		}
 	H_ H;
-	ubyte	data[WHIRLPOOL_BBLOCK/8];
+	ubyte[WHIRLPOOL_BBLOCK/8]	data;
 	uint	bitoff;
-	size_t		bitlen[WHIRLPOOL_COUNTER/size_t.sizeof];
+	size_t[WHIRLPOOL_COUNTER/size_t.sizeof]		bitlen;
 	};
 
 version(OPENSSL_NO_WHIRLPOOL) {} else {
diff --git a/deimos/openssl/x509.d b/deimos/openssl/x509.d
@@ -557,7 +557,7 @@ alias Netscape_certificate_sequence NETSCAPE_CERT_SEQUENCE;
 
 /* Unused (and iv length is wrong)
 struct CBCParameter_st {
-	ubyte iv[8];
+	ubyte[8] iv;
 	}
 alias CBCParameter_st CBC_PARAM;
 */

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ enum BF_ROUNDS = 16;`
`100`	`100`	`enum BF_BLOCK = 8;`
`101`	`101`
`102`	`102`	`struct bf_key_st {`
`103`		`- BF_LONG P[BF_ROUNDS+2];`
`104`		`- BF_LONG S[4*256];`
	`103`	`+ BF_LONG[BF_ROUNDS+2] P;`
	`104`	`+ BF_LONG[4*256] S;`
`105`	`105`	`}`
`106`	`106`	`alias bf_key_st BF_KEY;`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ enum CAST_BLOCK = 8;`
`78`	`78`	`enum CAST_KEY_LENGTH = 16;`
`79`	`79`
`80`	`80`	`struct cast_key_st {`
`81`		`- CAST_LONG data[32];`
	`81`	`+ CAST_LONG[32] data;`
`82`	`82`	`int short_key; /* Use reduced rounds for short key */`
`83`	`83`	`}`
`84`	`84`	`alias cast_key_st CAST_KEY;`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ extern (C):`
`76`	`76`	`nothrow:`
`77`	`77`
`78`	`78`	`struct idea_key_st {`
`79`		`- IDEA_INT data[9][6];`
	`79`	`+ IDEA_INT[9][6] data;`
`80`	`80`	`}`
`81`	`81`	`alias idea_key_st IDEA_KEY_SCHEDULE;`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ enum MD4_DIGEST_LENGTH = 16;`
`101`	`101`	`struct MD4state_st {`
`102`	`102`	`MD4_LONG A,B,C,D;`
`103`	`103`	`MD4_LONG Nl,Nh;`
`104`		`- MD4_LONG data[MD4_LBLOCK];`
	`104`	`+ MD4_LONG[MD4_LBLOCK] data;`
`105`	`105`	`uint num;`
`106`	`106`	`}`
`107`	`107`	`alias MD4state_st MD4_CTX;`