From e77ee5d5d38ad95bce550db62bf4105f43cf88c6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 Jan 2010 22:46:23 -0600 Subject: Coding style and whitespace cleanup. --- smime/lib/e-asn1-object.c | 3 ++- smime/lib/e-cert.c | 18 ++++++++++++------ smime/lib/e-pkcs12.c | 9 +++++++-- 3 files changed, 21 insertions(+), 9 deletions(-) (limited to 'smime/lib') diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index e8c51b6a24..7f69802ab6 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -122,7 +122,8 @@ e_asn1_object_get_type (void) (GInstanceInitFunc) e_asn1_object_init, }; - asn1_object_type = g_type_register_static (PARENT_TYPE, "EASN1Object", &asn1_object_info, 0); + asn1_object_type = g_type_register_static ( + PARENT_TYPE, "EASN1Object", &asn1_object_info, 0); } return asn1_object_type; diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index db4104859e..1b16d238a8 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -212,7 +212,8 @@ e_cert_populate (ECert *cert) cert->priv->cn = CERT_GetCommonName (&c->subject); cert->priv->issuer_cn = CERT_GetCommonName (&c->issuer); - if (SECSuccess == CERT_GetCertTimes (c, &cert->priv->issued_on, &cert->priv->expires_on)) { + if (SECSuccess == CERT_GetCertTimes ( + c, &cert->priv->issued_on, &cert->priv->expires_on)) { PRExplodedTime explodedTime; struct tm exploded_tm; gchar buf[32]; @@ -723,7 +724,8 @@ process_sec_algorithm_id (SECAlgorithmID *algID, get_oid_text (&algID->algorithm, &text); - if (!algID->parameters.len || algID->parameters.data[0] == E_ASN1_OBJECT_TYPE_NULL) { + if (!algID->parameters.len || + algID->parameters.data[0] == E_ASN1_OBJECT_TYPE_NULL) { e_asn1_object_set_display_value (sequence, text); e_asn1_object_set_valid_container (sequence, FALSE); } else { @@ -1130,7 +1132,8 @@ create_tbs_certificate_asn1_struct (ECert *cert, EASN1Object **seq) e_asn1_object_append_child (sequence, subitem); g_object_unref (subitem); - if (!process_subject_public_key_info (&cert->priv->cert->subjectPublicKeyInfo, sequence)) + if (!process_subject_public_key_info ( + &cert->priv->cert->subjectPublicKeyInfo, sequence)) return FALSE; /* Is there an issuerUniqueID? */ @@ -1200,14 +1203,17 @@ create_asn1_struct (ECert *cert) e_asn1_object_append_child (cert->priv->asn1, sequence); g_object_unref (sequence); - if (!process_sec_algorithm_id (&cert->priv->cert->signatureWrap.signatureAlgorithm, &sequence)) + if (!process_sec_algorithm_id ( + &cert->priv->cert->signatureWrap.signatureAlgorithm, &sequence)) return FALSE; - e_asn1_object_set_display_name (sequence, _("Certificate Signature Algorithm")); + e_asn1_object_set_display_name ( + sequence, _("Certificate Signature Algorithm")); e_asn1_object_append_child (cert->priv->asn1, sequence); g_object_unref (sequence); sequence = e_asn1_object_new (); - e_asn1_object_set_display_name (sequence, _("Certificate Signature Value")); + e_asn1_object_set_display_name ( + sequence, _("Certificate Signature Value")); /* The signatureWrap is encoded as a bit string. The function ProcessRawBytes expects the diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 52fa966f76..3a2122bb0f 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -246,7 +246,9 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot, *aWantRetry = FALSE; passwd.data = NULL; - rv = prompt_for_password (_("PKCS12 File Password"), _("Enter password for PKCS12 file:"), &passwd); + rv = prompt_for_password ( + _("PKCS12 File Password"), + _("Enter password for PKCS12 file:"), &passwd); if (!rv) goto finish; if (passwd.data == NULL) { handle_error (PKCS12_USER_CANCELED); @@ -332,7 +334,10 @@ e_pkcs12_import_from_file (EPKCS12 *pkcs12, const gchar *path, GError **error) } gboolean -e_pkcs12_export_to_file (EPKCS12 *pkcs12, const gchar *path, GList *certs, GError **error) +e_pkcs12_export_to_file (EPKCS12 *pkcs12, + const gchar *path, + GList *certs, + GError **error) { return FALSE; } -- cgit