Bug 1118245. Apply uniform style across NSS [remove trailing commas in initializers]. r=ekr

4 files changed, 29 insertions, 29 deletions

diff --git a/lib/cryptohi/dsautil.c b/lib/cryptohi/dsautil.c
index 5606379df..fb699ba02 100644
--- a/lib/cryptohi/dsautil.c
+++ b/lib/cryptohi/dsautil.c
@@ -20,7 +20,7 @@ const SEC_ASN1Template DSA_SignatureTemplate[] =
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(DSA_ASN1Signature) },
     { SEC_ASN1_INTEGER, offsetof(DSA_ASN1Signature,r) },
     { SEC_ASN1_INTEGER, offsetof(DSA_ASN1Signature,s) },
-    { 0, }
+    { 0 }
 };
 
 /* Input is variable length multi-byte integer, MSB first (big endian).
diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c
index 1fcd4087f..830f5b668 100644
--- a/lib/cryptohi/seckey.c
+++ b/lib/cryptohi/seckey.c
@@ -25,8 +25,8 @@ const SEC_ASN1Template CERT_SubjectPublicKeyInfoTemplate[] = {
 	  offsetof(CERTSubjectPublicKeyInfo,algorithm),
 	  SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
     { SEC_ASN1_BIT_STRING,
-	  offsetof(CERTSubjectPublicKeyInfo,subjectPublicKey), },
-    { 0, }
+	  offsetof(CERTSubjectPublicKeyInfo,subjectPublicKey) },
+    { 0 }
 };
 
 const SEC_ASN1Template CERT_PublicKeyAndChallengeTemplate[] =
@@ -39,9 +39,9 @@ const SEC_ASN1Template CERT_PublicKeyAndChallengeTemplate[] =
 
 const SEC_ASN1Template SECKEY_RSAPublicKeyTemplate[] = {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPublicKey) },
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.modulus), },
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.publicExponent), },
-    { 0, }
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.modulus) },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.publicExponent) },
+    { 0 }
 };
 
 static const SEC_ASN1Template seckey_PointerToAlgorithmIDTemplate[] = {
@@ -73,8 +73,8 @@ const SEC_ASN1Template SECKEY_RSAPSSParamsTemplate[] =
 };
 
 const SEC_ASN1Template SECKEY_DSAPublicKeyTemplate[] = {
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dsa.publicValue), },
-    { 0, }
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dsa.publicValue) },
+    { 0 }
 };
 
 const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
@@ -82,21 +82,21 @@ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
     { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,prime) },
     { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,subPrime) },
     { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,base) },
-    { 0, }
+    { 0 }
 };
 
 const SEC_ASN1Template SECKEY_DHPublicKeyTemplate[] = {
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.publicValue), },
-    { 0, }
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.publicValue) },
+    { 0 }
 };
 
 const SEC_ASN1Template SECKEY_DHParamKeyTemplate[] = {
     { SEC_ASN1_SEQUENCE,  0, NULL, sizeof(SECKEYPublicKey) },
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.prime), },
-    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.base), },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.prime) },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.base) },
     /* XXX chrisk: this needs to be expanded for decoding of j and validationParms (RFC2459 7.3.2) */
     { SEC_ASN1_SKIP_REST },
-    { 0, }
+    { 0 }
 };
 
 SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_DSAPublicKeyTemplate)
diff --git a/lib/cryptohi/secsign.c b/lib/cryptohi/secsign.c
index fa4bf5fff..40c44391b 100644
--- a/lib/cryptohi/secsign.c
+++ b/lib/cryptohi/secsign.c
@@ -113,10 +113,10 @@ static DERTemplate SECAlgorithmIDTemplate[] = {
     { DER_SEQUENCE,
 	  0, NULL, sizeof(SECAlgorithmID) },
     { DER_OBJECT_ID,
-	  offsetof(SECAlgorithmID,algorithm), },
+	  offsetof(SECAlgorithmID,algorithm) },
     { DER_OPTIONAL | DER_ANY,
-	  offsetof(SECAlgorithmID,parameters), },
-    { 0, }
+	  offsetof(SECAlgorithmID,parameters) },
+    { 0 }
 };
 
 /*
@@ -128,10 +128,10 @@ static DERTemplate SGNDigestInfoTemplate[] = {
 	  0, NULL, sizeof(SGNDigestInfo) },
     { DER_INLINE,
 	  offsetof(SGNDigestInfo,digestAlgorithm),
-	  SECAlgorithmIDTemplate, },
+	  SECAlgorithmIDTemplate },
     { DER_OCTET_STRING,
-	  offsetof(SGNDigestInfo,digest), },
-    { 0, }
+	  offsetof(SGNDigestInfo,digest) },
+    { 0 }
 };
 
 SECStatus
@@ -269,13 +269,13 @@ DERTemplate CERTSignedDataTemplate[] =
     { DER_SEQUENCE,
 	  0, NULL, sizeof(CERTSignedData) },
     { DER_ANY,
-	  offsetof(CERTSignedData,data), },
+	  offsetof(CERTSignedData,data) },
     { DER_INLINE,
 	  offsetof(CERTSignedData,signatureAlgorithm),
-	  SECAlgorithmIDTemplate, },
+	  SECAlgorithmIDTemplate },
     { DER_BIT_STRING,
-	  offsetof(CERTSignedData,signature), },
-    { 0, }
+	  offsetof(CERTSignedData,signature) },
+    { 0 }
 };
 
 SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
@@ -285,13 +285,13 @@ const SEC_ASN1Template CERT_SignedDataTemplate[] =
     { SEC_ASN1_SEQUENCE,
 	  0, NULL, sizeof(CERTSignedData) },
     { SEC_ASN1_ANY,
-	  offsetof(CERTSignedData,data), },
+	  offsetof(CERTSignedData,data) },
     { SEC_ASN1_INLINE | SEC_ASN1_XTRN,
 	  offsetof(CERTSignedData,signatureAlgorithm),
-	  SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate), },
+	  SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
     { SEC_ASN1_BIT_STRING,
-	  offsetof(CERTSignedData,signature), },
-    { 0, }
+	  offsetof(CERTSignedData,signature) },
+    { 0 }
 };
 
 SEC_ASN1_CHOOSER_IMPLEMENT(CERT_SignedDataTemplate)
diff --git a/lib/cryptohi/secvfy.c b/lib/cryptohi/secvfy.c
index c869167cd..aebd93853 100644
--- a/lib/cryptohi/secvfy.c
+++ b/lib/cryptohi/secvfy.c
@@ -207,7 +207,7 @@ const SEC_ASN1Template hashParameterTemplate[] =
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECItem) },
     { SEC_ASN1_OBJECT_ID, 0 },
     { SEC_ASN1_SKIP_REST },
-    { 0, }
+    { 0 }
 };
 
 /*