KNF.

1 files changed, 63 insertions, 64 deletions

diff --git a/lib/libssl/src/crypto/objects/obj_xref.c b/lib/libssl/src/crypto/objects/obj_xref.c
index 797adc8d108..25aed74ff11 100644
--- a/lib/libssl/src/crypto/objects/obj_xref.c
+++ b/lib/libssl/src/crypto/objects/obj_xref.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -62,51 +62,54 @@
 DECLARE_STACK_OF(nid_triple)
 STACK_OF(nid_triple) *sig_app, *sigx_app;
 
-static int sig_cmp(const nid_triple *a, const nid_triple *b)
-	{
+static int
+sig_cmp(const nid_triple *a, const nid_triple *b)
+{
 	return a->sign_id - b->sign_id;
-	}
+}
 
 DECLARE_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
 
-static int sig_sk_cmp(const nid_triple * const *a, const nid_triple * const *b)
-	{
+static int
+sig_sk_cmp(const nid_triple * const *a, const nid_triple * const *b)
+{
 	return (*a)->sign_id - (*b)->sign_id;
-	}
+}
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
 
-static int sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
-	{
+static int
+sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
+{
 	int ret;
+
 	ret = (*a)->hash_id - (*b)->hash_id;
 	if (ret)
 		return ret;
 	return (*a)->pkey_id - (*b)->pkey_id;
-	}
+}
 
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
 
-int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
-	{
+int
+OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
+{
 	nid_triple tmp;
 	const nid_triple *rv = NULL;
 	tmp.sign_id = signid;
 
-	if (sig_app)
-		{
+	if (sig_app) {
 		int idx = sk_nid_triple_find(sig_app, &tmp);
 		if (idx >= 0)
 			rv = sk_nid_triple_value(sig_app, idx);
-		}
+	}
 
 #ifndef OBJ_XREF_TEST2
-	if (rv == NULL)
-		{
+	if (rv == NULL) {
 		rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
-				 sizeof(sigoid_srt) / sizeof(nid_triple));
-		}
+		    sizeof(sigoid_srt) / sizeof(nid_triple));
+	}
 #endif
 	if (rv == NULL)
 		return 0;
@@ -115,45 +118,44 @@ int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
 	if (ppkey_nid)
 		*ppkey_nid = rv->pkey_id;
 	return 1;
-	}
+}
 
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
-	{
+int
+OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
+{
 	nid_triple tmp;
-	const nid_triple *t=&tmp;
+	const nid_triple *t = &tmp;
 	const nid_triple **rv = NULL;
 
 	tmp.hash_id = dig_nid;
 	tmp.pkey_id = pkey_nid;
 
-	if (sigx_app)
-		{
+	if (sigx_app) {
 		int idx = sk_nid_triple_find(sigx_app, &tmp);
-		if (idx >= 0)
-			{
+		if (idx >= 0) {
 			t = sk_nid_triple_value(sigx_app, idx);
 			rv = &t;
-			}
 		}
+	}
 
 #ifndef OBJ_XREF_TEST2
-	if (rv == NULL)
-		{
+	if (rv == NULL) {
 		rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
-				 sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
-				 );
-		}
+		    sizeof(sigoid_srt_xref) / sizeof(nid_triple *));
+	}
 #endif
 	if (rv == NULL)
 		return 0;
 	if (psignid)
 		*psignid = (*rv)->sign_id;
 	return 1;
-	}
+}
 
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
-	{
+int
+OBJ_add_sigid(int signid, int dig_id, int pkey_id)
+{
 	nid_triple *ntr;
+
 	if (!sig_app)
 		sig_app = sk_nid_triple_new(sig_sk_cmp);
 	if (!sig_app)
@@ -169,11 +171,10 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
 	ntr->hash_id = dig_id;
 	ntr->pkey_id = pkey_id;
 
-	if (!sk_nid_triple_push(sig_app, ntr))
-		{
+	if (!sk_nid_triple_push(sig_app, ntr)) {
 		free(ntr);
 		return 0;
-		}
+	}
 
 	if (!sk_nid_triple_push(sigx_app, ntr))
 		return 0;
@@ -182,53 +183,51 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
 	sk_nid_triple_sort(sigx_app);
 
 	return 1;
-	}
+}
 
-static void sid_free(nid_triple *tt)
-	{
+static void
+sid_free(nid_triple *tt)
+{
 	free(tt);
-	}
+}
 
-void OBJ_sigid_free(void)
-	{
-	if (sig_app)
-		{
+void
+OBJ_sigid_free(void)
+{
+	if (sig_app) {
 		sk_nid_triple_pop_free(sig_app, sid_free);
 		sig_app = NULL;
-		}
-	if (sigx_app)
-		{
+	}
+	if (sigx_app) {
 		sk_nid_triple_free(sigx_app);
 		sigx_app = NULL;
-		}
 	}
-		
+}
+
 #ifdef OBJ_XREF_TEST
 
 main()
-	{
+{
 	int n1, n2, n3;
 
 	int i, rv;
 #ifdef OBJ_XREF_TEST2
-	for (i = 0; i <	sizeof(sigoid_srt) / sizeof(nid_triple); i++)
-		{
+	for (i = 0; i <	sizeof(sigoid_srt) / sizeof(nid_triple); i++) {
 		OBJ_add_sigid(sigoid_srt[i][0], sigoid_srt[i][1],
-				sigoid_srt[i][2]);
-		}
+		    sigoid_srt[i][2]);
+	}
 #endif
 
-	for (i = 0; i <	sizeof(sigoid_srt) / sizeof(nid_triple); i++)
-		{
+	for (i = 0; i <	sizeof(sigoid_srt) / sizeof(nid_triple); i++) {
 		n1 = sigoid_srt[i][0];
 		rv = OBJ_find_sigid_algs(n1, &n2, &n3);
 		printf("Forward: %d, %s %s %s\n", rv,
-			OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
-		n1=0;
+		    OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
+		n1 = 0;
 		rv = OBJ_find_sigid_by_algs(&n1, n2, n3);
 		printf("Reverse: %d, %s %s %s\n", rv,
-			OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
-		}
+		    OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
 	}
-	
+}
+
 #endif