[glib-networking] gnutls: whitespace fixes
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] gnutls: whitespace fixes
- Date: Mon, 8 Feb 2016 13:15:11 +0000 (UTC)
commit c6e1e2a90432d206b42ab64c27f9149d9c3f7395
Author: Dan Winship <danw gnome org>
Date: Sat Feb 6 13:48:52 2016 +0100
gnutls: whitespace fixes
tls/gnutls/gtlsdatabase-gnutls-pkcs11.c | 186 +++++++++++++++---------------
tls/gnutls/gtlsdatabase-gnutls.c | 58 +++++-----
tls/gnutls/gtlsfiledatabase-gnutls.c | 78 +++++++-------
3 files changed, 161 insertions(+), 161 deletions(-)
---
diff --git a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
index 6b1b32a..74fda3d 100644
--- a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
+++ b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
@@ -146,7 +146,7 @@ discover_module_slots_and_options (GTlsDatabaseGnutlsPkcs11 *self,
}
static GTlsCertificate *
-create_database_pkcs11_certificate (GPkcs11Slot *slot,
+create_database_pkcs11_certificate (GPkcs11Slot *slot,
GPkcs11Array *certificate_attrs,
GPkcs11Array *private_key_attrs)
{
@@ -212,7 +212,7 @@ create_database_pkcs11_certificate (GPkcs11Slot *slot,
return certificate;
}
-static const gchar*
+static const gchar *
calculate_peer_for_identity (GSocketConnectable *identity)
{
const char *peer;
@@ -258,56 +258,56 @@ g_tls_database_gnutls_pkcs11_init (GTlsDatabaseGnutlsPkcs11 *self)
}
static gboolean
-accumulate_stop (gpointer result,
- gpointer user_data)
+accumulate_stop (gpointer result,
+ gpointer user_data)
{
return FALSE; /* stop enumeration */
}
static gboolean
-accumulate_exists (gpointer result,
- gpointer user_data)
+accumulate_exists (gpointer result,
+ gpointer user_data)
{
- gboolean *exists = (gboolean*)user_data;
+ gboolean *exists = (gboolean *)user_data;
*exists = TRUE;
return FALSE; /* stop enumeration */
}
static gboolean
-accumulate_first_attributes (gpointer result,
- gpointer user_data)
+accumulate_first_attributes (gpointer result,
+ gpointer user_data)
{
- GPkcs11Array** attributes = (GPkcs11Array**)user_data;
+ GPkcs11Array **attributes = (GPkcs11Array **)user_data;
g_assert (attributes);
*attributes = g_pkcs11_array_ref (result);
return FALSE; /* stop enumeration */
}
static gboolean
-accumulate_list_attributes (gpointer result,
- gpointer user_data)
+accumulate_list_attributes (gpointer result,
+ gpointer user_data)
{
- GList **results = (GList**)user_data;
+ GList **results = (GList **)user_data;
g_assert (results);
*results = g_list_append (*results, g_pkcs11_array_ref (result));
return TRUE; /* continue enumeration */
}
static gboolean
-accumulate_first_object (gpointer result,
- gpointer user_data)
+accumulate_first_object (gpointer result,
+ gpointer user_data)
{
- GObject** object = (GObject**)user_data;
+ GObject **object = (GObject **)user_data;
g_assert (object);
*object = g_object_ref (result);
return FALSE; /* stop enumeration */
}
static gboolean
-accumulate_list_objects (gpointer result,
- gpointer user_data)
+accumulate_list_objects (gpointer result,
+ gpointer user_data)
{
- GList **results = (GList**)user_data;
+ GList **results = (GList **)user_data;
g_assert (results);
*results = g_list_append (*results, g_object_ref (result));
return TRUE; /* continue enumeration */
@@ -315,8 +315,8 @@ accumulate_list_objects (gpointer result,
static GPkcs11EnumerateState
enumerate_call_accumulator (GPkcs11Accumulator accumulator,
- gpointer result,
- gpointer user_data)
+ gpointer result,
+ gpointer user_data)
{
g_assert (accumulator);
@@ -327,13 +327,13 @@ enumerate_call_accumulator (GPkcs11Accumulator accumulator,
}
static GPkcs11EnumerateState
-enumerate_assertion_exists_in_slot (GPkcs11Slot *slot,
- GTlsInteraction *interaction,
- GPkcs11Array *match,
- GPkcs11Accumulator accumulator,
- gpointer user_data,
- GCancellable *cancellable,
- GError **error)
+enumerate_assertion_exists_in_slot (GPkcs11Slot *slot,
+ GTlsInteraction *interaction,
+ GPkcs11Array *match,
+ GPkcs11Accumulator accumulator,
+ gpointer user_data,
+ GCancellable *cancellable,
+ GError **error)
{
GPkcs11EnumerateState state;
@@ -386,13 +386,13 @@ enumerate_assertion_exists_in_database (GTlsDatabaseGnutlsPkcs11 *self,
}
static gboolean
-g_tls_database_gnutls_pkcs11_lookup_assertion (GTlsDatabaseGnutls *database,
- GTlsCertificateGnutls *certificate,
- GTlsDatabaseGnutlsAssertion assertion,
- const gchar *purpose,
- GSocketConnectable *identity,
- GCancellable *cancellable,
- GError **error)
+g_tls_database_gnutls_pkcs11_lookup_assertion (GTlsDatabaseGnutls *database,
+ GTlsCertificateGnutls *certificate,
+ GTlsDatabaseGnutlsAssertion assertion,
+ const gchar *purpose,
+ GSocketConnectable *identity,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsDatabaseGnutlsPkcs11 *self = G_TLS_DATABASE_GNUTLS_PKCS11 (database);
GByteArray *der = NULL;
@@ -440,13 +440,13 @@ g_tls_database_gnutls_pkcs11_lookup_assertion (GTlsDatabaseGnutls *data
}
static GPkcs11EnumerateState
-enumerate_keypair_for_certificate (GPkcs11Slot *slot,
- GTlsInteraction *interaction,
- GPkcs11Array *match_certificate,
- GPkcs11Accumulator accumulator,
- gpointer user_data,
- GCancellable *cancellable,
- GError **error)
+enumerate_keypair_for_certificate (GPkcs11Slot *slot,
+ GTlsInteraction *interaction,
+ GPkcs11Array *match_certificate,
+ GPkcs11Accumulator accumulator,
+ gpointer user_data,
+ GCancellable *cancellable,
+ GError **error)
{
static CK_OBJECT_CLASS key_class = CKO_PRIVATE_KEY;
GPkcs11Array *private_key_attrs = NULL;
@@ -503,14 +503,14 @@ enumerate_keypair_for_certificate (GPkcs11Slot *slot,
}
static GPkcs11EnumerateState
-enumerate_keypairs_in_slot (GPkcs11Slot *slot,
- GTlsInteraction *interaction,
- CK_ATTRIBUTE_PTR match,
- CK_ULONG match_count,
- GPkcs11Accumulator accumulator,
- gpointer user_data,
- GCancellable *cancellable,
- GError **error)
+enumerate_keypairs_in_slot (GPkcs11Slot *slot,
+ GTlsInteraction *interaction,
+ CK_ATTRIBUTE_PTR match,
+ CK_ULONG match_count,
+ GPkcs11Accumulator accumulator,
+ gpointer user_data,
+ GCancellable *cancellable,
+ GError **error)
{
GPkcs11EnumerateState state;
GList *results = NULL;
@@ -576,14 +576,14 @@ accumulate_wrap_into_certificate (gpointer result,
}
static GPkcs11EnumerateState
-enumerate_certificates_in_slot (GPkcs11Slot *slot,
- GTlsInteraction *interaction,
- CK_ATTRIBUTE_PTR match,
- CK_ULONG match_count,
- GPkcs11Accumulator accumulator,
- gpointer user_data,
- GCancellable *cancellable,
- GError **error)
+enumerate_certificates_in_slot (GPkcs11Slot *slot,
+ GTlsInteraction *interaction,
+ CK_ATTRIBUTE_PTR match,
+ CK_ULONG match_count,
+ GPkcs11Accumulator accumulator,
+ gpointer user_data,
+ GCancellable *cancellable,
+ GError **error)
{
enumerate_certificates_closure closure = { accumulator, user_data, slot };
@@ -602,16 +602,16 @@ enumerate_certificates_in_slot (GPkcs11Slot *slot,
}
static GPkcs11EnumerateState
-enumerate_certificates_in_database (GTlsDatabaseGnutlsPkcs11 *self,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- CK_ATTRIBUTE_PTR match,
- CK_ULONG match_count,
- P11KitUri *match_slot_to_uri,
- GPkcs11Accumulator accumulator,
- gpointer user_data,
- GCancellable *cancellable,
- GError **error)
+enumerate_certificates_in_database (GTlsDatabaseGnutlsPkcs11 *self,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ CK_ATTRIBUTE_PTR match,
+ CK_ULONG match_count,
+ P11KitUri *match_slot_to_uri,
+ GPkcs11Accumulator accumulator,
+ gpointer user_data,
+ GCancellable *cancellable,
+ GError **error)
{
GPkcs11EnumerateState state = G_PKCS11_ENUMERATE_CONTINUE;
GPkcs11Slot *slot;
@@ -653,13 +653,13 @@ enumerate_certificates_in_database (GTlsDatabaseGnutlsPkcs11 *self,
return state;
}
-static GTlsCertificate*
-g_tls_database_gnutls_pkcs11_lookup_certificate_issuer (GTlsDatabase *database,
- GTlsCertificate *certificate,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GTlsCertificate *
+g_tls_database_gnutls_pkcs11_lookup_certificate_issuer (GTlsDatabase *database,
+ GTlsCertificate *certificate,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsDatabaseGnutlsPkcs11 *self = G_TLS_DATABASE_GNUTLS_PKCS11 (database);
GTlsCertificate *result = NULL;
@@ -692,13 +692,13 @@ g_tls_database_gnutls_pkcs11_lookup_certificate_issuer (GTlsDatabase *
return result;
}
-static GList*
-g_tls_database_gnutls_pkcs11_lookup_certificates_issued_by (GTlsDatabase *database,
- GByteArray *issuer_subject,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GList *
+g_tls_database_gnutls_pkcs11_lookup_certificates_issued_by (GTlsDatabase *database,
+ GByteArray *issuer_subject,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsDatabaseGnutlsPkcs11 *self = G_TLS_DATABASE_GNUTLS_PKCS11 (database);
GList *l, *results = NULL;
@@ -729,9 +729,9 @@ g_tls_database_gnutls_pkcs11_lookup_certificates_issued_by (GTlsDatabase
return results;
}
-static gchar*
-g_tls_database_gnutls_pkcs11_create_certificate_handle (GTlsDatabase *database,
- GTlsCertificate *certificate)
+static gchar *
+g_tls_database_gnutls_pkcs11_create_certificate_handle (GTlsDatabase *database,
+ GTlsCertificate *certificate)
{
GTlsCertificateGnutlsPkcs11 *pkcs11_cert;
@@ -742,13 +742,13 @@ g_tls_database_gnutls_pkcs11_create_certificate_handle (GTlsDatabase
return g_tls_certificate_gnutls_pkcs11_build_certificate_uri (pkcs11_cert, NULL);
}
-static GTlsCertificate*
-g_tls_database_gnutls_pkcs11_lookup_certificate_for_handle (GTlsDatabase *database,
- const gchar *handle,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GTlsCertificate *
+g_tls_database_gnutls_pkcs11_lookup_certificate_for_handle (GTlsDatabase *database,
+ const gchar *handle,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsDatabaseGnutlsPkcs11 *self = G_TLS_DATABASE_GNUTLS_PKCS11 (database);
GTlsCertificate *result = NULL;
@@ -863,7 +863,7 @@ g_tls_database_gnutls_pkcs11_initable_iface_init (GInitableIface *iface)
iface->init = g_tls_database_gnutls_pkcs11_initable_init;
}
-GTlsDatabase*
+GTlsDatabase *
g_tls_database_gnutls_pkcs11_new (GError **error)
{
g_return_val_if_fail (!error || !*error, NULL);
diff --git a/tls/gnutls/gtlsdatabase-gnutls.c b/tls/gnutls/gtlsdatabase-gnutls.c
index 62a0ab3..1c15adc 100644
--- a/tls/gnutls/gtlsdatabase-gnutls.c
+++ b/tls/gnutls/gtlsdatabase-gnutls.c
@@ -59,17 +59,17 @@ is_self_signed (GTlsCertificateGnutls *certificate)
}
static gint
-build_certificate_chain (GTlsDatabaseGnutls *self,
- GTlsCertificateGnutls *certificate,
- GTlsCertificateGnutls *previous,
- gboolean certificate_is_from_db,
- guint recursion_depth,
- const gchar *purpose,
- GSocketConnectable *identity,
- GTlsInteraction *interaction,
- GCancellable *cancellable,
- GTlsCertificateGnutls **anchor,
- GError **error)
+build_certificate_chain (GTlsDatabaseGnutls *self,
+ GTlsCertificateGnutls *certificate,
+ GTlsCertificateGnutls *previous,
+ gboolean certificate_is_from_db,
+ guint recursion_depth,
+ const gchar *purpose,
+ GSocketConnectable *identity,
+ GTlsInteraction *interaction,
+ GCancellable *cancellable,
+ GTlsCertificateGnutls **anchor,
+ GError **error)
{
GTlsCertificate *issuer;
gint status;
@@ -194,9 +194,9 @@ double_check_before_after_dates (GTlsCertificateGnutls *chain)
}
static void
-convert_certificate_chain_to_gnutls (GTlsCertificateGnutls *chain,
- gnutls_x509_crt_t **gnutls_chain,
- guint *gnutls_chain_length)
+convert_certificate_chain_to_gnutls (GTlsCertificateGnutls *chain,
+ gnutls_x509_crt_t **gnutls_chain,
+ guint *gnutls_chain_length)
{
GTlsCertificate *cert;
guint i;
@@ -218,14 +218,14 @@ convert_certificate_chain_to_gnutls (GTlsCertificateGnutls *chain,
}
static GTlsCertificateFlags
-g_tls_database_gnutls_verify_chain (GTlsDatabase *database,
- GTlsCertificate *chain,
- const gchar *purpose,
- GSocketConnectable *identity,
- GTlsInteraction *interaction,
- GTlsDatabaseVerifyFlags flags,
- GCancellable *cancellable,
- GError **error)
+g_tls_database_gnutls_verify_chain (GTlsDatabase *database,
+ GTlsCertificate *chain,
+ const gchar *purpose,
+ GSocketConnectable *identity,
+ GTlsInteraction *interaction,
+ GTlsDatabaseVerifyFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsDatabaseGnutls *self;
GTlsCertificateFlags result;
@@ -327,13 +327,13 @@ g_tls_database_gnutls_class_init (GTlsDatabaseGnutlsClass *klass)
}
gboolean
-g_tls_database_gnutls_lookup_assertion (GTlsDatabaseGnutls *self,
- GTlsCertificateGnutls *certificate,
- GTlsDatabaseGnutlsAssertion assertion,
- const gchar *purpose,
- GSocketConnectable *identity,
- GCancellable *cancellable,
- GError **error)
+g_tls_database_gnutls_lookup_assertion (GTlsDatabaseGnutls *self,
+ GTlsCertificateGnutls *certificate,
+ GTlsDatabaseGnutlsAssertion assertion,
+ const gchar *purpose,
+ GSocketConnectable *identity,
+ GCancellable *cancellable,
+ GError **error)
{
g_return_val_if_fail (G_IS_TLS_DATABASE_GNUTLS (self), FALSE);
g_return_val_if_fail (G_IS_TLS_CERTIFICATE_GNUTLS (certificate), FALSE);
diff --git a/tls/gnutls/gtlsfiledatabase-gnutls.c b/tls/gnutls/gtlsfiledatabase-gnutls.c
index 1fb7224..24d54a9 100644
--- a/tls/gnutls/gtlsfiledatabase-gnutls.c
+++ b/tls/gnutls/gtlsfiledatabase-gnutls.c
@@ -183,11 +183,11 @@ create_handles_array_unlocked (const gchar *filename,
}
static gboolean
-load_anchor_file (const gchar *filename,
- GHashTable *subjects,
- GHashTable *issuers,
- GHashTable *complete,
- GError **error)
+load_anchor_file (const gchar *filename,
+ GHashTable *subjects,
+ GHashTable *issuers,
+ GHashTable *complete,
+ GError **error)
{
GList *list, *l;
gnutls_x509_crt_t cert;
@@ -335,9 +335,9 @@ g_tls_file_database_gnutls_init (GTlsFileDatabaseGnutls *self)
g_mutex_init (&self->priv->mutex);
}
-static gchar*
-g_tls_file_database_gnutls_create_certificate_handle (GTlsDatabase *database,
- GTlsCertificate *certificate)
+static gchar *
+g_tls_file_database_gnutls_create_certificate_handle (GTlsDatabase *database,
+ GTlsCertificate *certificate)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (database);
GBytes *der;
@@ -362,13 +362,13 @@ g_tls_file_database_gnutls_create_certificate_handle (GTlsDatabase *d
return handle;
}
-static GTlsCertificate*
-g_tls_file_database_gnutls_lookup_certificate_for_handle (GTlsDatabase *database,
- const gchar *handle,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GTlsCertificate *
+g_tls_file_database_gnutls_lookup_certificate_for_handle (GTlsDatabase *database,
+ const gchar *handle,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (database);
GTlsCertificate *cert;
@@ -411,13 +411,13 @@ g_tls_file_database_gnutls_lookup_certificate_for_handle (GTlsDatabase
}
static gboolean
-g_tls_file_database_gnutls_lookup_assertion (GTlsDatabaseGnutls *database,
- GTlsCertificateGnutls *certificate,
- GTlsDatabaseGnutlsAssertion assertion,
- const gchar *purpose,
- GSocketConnectable *identity,
- GCancellable *cancellable,
- GError **error)
+g_tls_file_database_gnutls_lookup_assertion (GTlsDatabaseGnutls *database,
+ GTlsCertificateGnutls *certificate,
+ GTlsDatabaseGnutlsAssertion assertion,
+ const gchar *purpose,
+ GSocketConnectable *identity,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (database);
GBytes *der = NULL;
@@ -450,13 +450,13 @@ g_tls_file_database_gnutls_lookup_assertion (GTlsDatabaseGnutls *databa
return contains;
}
-static GTlsCertificate*
-g_tls_file_database_gnutls_lookup_certificate_issuer (GTlsDatabase *database,
- GTlsCertificate *certificate,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GTlsCertificate *
+g_tls_file_database_gnutls_lookup_certificate_issuer (GTlsDatabase *database,
+ GTlsCertificate *certificate,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (database);
gnutls_datum_t dn = { NULL, 0 };
@@ -509,13 +509,13 @@ g_tls_file_database_gnutls_lookup_certificate_issuer (GTlsDatabase *da
return issuer;
}
-static GList*
-g_tls_file_database_gnutls_lookup_certificates_issued_by (GTlsDatabase *database,
- GByteArray *issuer_raw_dn,
- GTlsInteraction *interaction,
- GTlsDatabaseLookupFlags flags,
- GCancellable *cancellable,
- GError **error)
+static GList *
+g_tls_file_database_gnutls_lookup_certificates_issued_by (GTlsDatabase *database,
+ GByteArray *issuer_raw_dn,
+ GTlsInteraction *interaction,
+ GTlsDatabaseLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (database);
GBytes *issuer;
@@ -588,9 +588,9 @@ g_tls_file_database_gnutls_file_database_interface_init (GTlsFileDatabaseInterfa
}
static gboolean
-g_tls_file_database_gnutls_initable_init (GInitable *initable,
- GCancellable *cancellable,
- GError **error)
+g_tls_file_database_gnutls_initable_init (GInitable *initable,
+ GCancellable *cancellable,
+ GError **error)
{
GTlsFileDatabaseGnutls *self = G_TLS_FILE_DATABASE_GNUTLS (initable);
GHashTable *subjects, *issuers, *complete;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
