Style police a'la niklas@.

3 files changed, 16 insertions, 16 deletions

diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c
index 5f4421b3fad..bfdcfde757a 100644
--- a/sbin/isakmpd/ike_auth.c
+++ b/sbin/isakmpd/ike_auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ike_auth.c,v 1.38 2001/03/27 18:47:09 ho Exp $	*/
+/*	$OpenBSD: ike_auth.c,v 1.39 2001/04/09 12:34:37 ho Exp $	*/
 /*	$EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $	*/
 
 /*
@@ -199,7 +199,7 @@ ike_auth_get_key (int type, char *id, char *local_id, size_t *keylen)
 	  int fd;
 
 	  privkeyfile = calloc (strlen (keyfile) + strlen (local_id) +
-				strlen (PRIVATE_KEY_FILE) + 3, sizeof(char));
+				strlen (PRIVATE_KEY_FILE) + 3, sizeof (char));
 	  if (privkeyfile == NULL)
 	    {
 	      log_print ("ike_auth_get_key: failed to allocate %d bytes",
@@ -226,7 +226,7 @@ ike_auth_get_key (int type, char *id, char *local_id, size_t *keylen)
 	      return 0;
 	    }
 
-	  buf = calloc (sb.st_size + 1, sizeof(char));
+	  buf = calloc (sb.st_size + 1, sizeof (char));
 	  if (buf == NULL)
 	    {
 	      log_print ("ike_auth_get_key: failed allocating %d bytes",
@@ -741,7 +741,7 @@ rsa_sig_decode_hash (struct message *msg)
 	    }
 
 	  exchange->recv_key = calloc (strlen (pp) + strlen ("rsa-hex:") + 1,
-				       sizeof(char));
+				       sizeof (char));
 	  if (exchange->recv_key == NULL)
 	    {
 	      free (pp);
diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index bc760944441..35a87812a81 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ike_quick_mode.c,v 1.46 2001/03/13 14:05:18 ho Exp $	*/
+/*	$OpenBSD: ike_quick_mode.c,v 1.47 2001/04/09 12:34:37 ho Exp $	*/
 /*	$EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $	*/
 
 /*
@@ -196,11 +196,11 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
        * appropriate prefix tag.
        */
       nprinc = 3;
-      principal = calloc (nprinc, sizeof(*principal));
+      principal = calloc (nprinc, sizeof *principal);
       if (principal == NULL)
         {
 	  log_error ("check_policy: failed to allocate %d bytes",
-		     nprinc * sizeof(*principal));
+		     nprinc * sizeof *principal);
 	  goto policydone;
 	}
 
@@ -252,11 +252,11 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
 #ifdef USE_KEYNOTE
       nprinc = 1;
 
-      principal = calloc (nprinc, sizeof(*principal));
+      principal = calloc (nprinc, sizeof *principal);
       if (principal == NULL)
         {
 	  log_error ("check_policy: failed to allocate %d bytes",
-		     nprinc * sizeof(*principal));
+		     nprinc * sizeof *principal);
 	  goto policydone;
 	}
 
@@ -280,7 +280,7 @@ check_policy (struct exchange *exchange, struct sa *sa, struct sa *isakmp_sa)
 	  goto policydone;
 	}
 
-      principal = calloc (2, sizeof(*principal));
+      principal = calloc (2, sizeof *principal);
       if (principal == NULL)
         {
 	  log_error ("check_policy: failed to get memory for principal");
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c
index a75f61dd63f..f5e0670337b 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: policy.c,v 1.27 2001/04/05 23:18:53 ho Exp $	*/
+/*	$OpenBSD: policy.c,v 1.28 2001/04/09 12:34:38 ho Exp $	*/
 /*	$EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */
 
 /*
@@ -871,7 +871,7 @@ policy_callback (char *name)
 	      my_inet_ntop4 (&net, remote_filter_addr_upper,
 			     sizeof remote_filter_addr_upper - 1, 1);
 	      my_inet_ntop4 (&net, remote_filter_addr_lower,
-			     sizeof (remote_filter_addr_lower) - 1, 1);
+			     sizeof remote_filter_addr_lower - 1, 1);
 	      remote_filter = strdup (remote_filter_addr_upper);
 	      if (!remote_filter)
 	        {
@@ -1605,7 +1605,7 @@ keynote_cert_init (void)
 void *
 keynote_cert_get (u_int8_t *data, u_int32_t len)
 {
-  char *foo = calloc (len + 1, sizeof(char));
+  char *foo = calloc (len + 1, sizeof (char));
 
   if (foo == NULL)
     return NULL;
@@ -1755,7 +1755,7 @@ keynote_cert_obtain (u_int8_t *id, size_t id_len, void *data, u_int8_t **cert,
       {
 	struct in_addr in;
 
-	file = calloc (len + 15, sizeof(char));
+	file = calloc (len + 15, sizeof (char));
 	if (file == NULL)
 	  {
 	    log_error ("keynote_cert_obtain: failed to allocate %d bytes",
@@ -1763,7 +1763,7 @@ keynote_cert_obtain (u_int8_t *id, size_t id_len, void *data, u_int8_t **cert,
 	    return 0;
 	  }
 
-	memcpy (&in, id, sizeof(in));
+	memcpy (&in, id, sizeof in);
 	sprintf (file, "%s/%s/%s", dirname, inet_ntoa (in), CREDENTIAL_FILE);
 	break;
       }
@@ -1771,7 +1771,7 @@ keynote_cert_obtain (u_int8_t *id, size_t id_len, void *data, u_int8_t **cert,
     case IPSEC_ID_FQDN:
     case IPSEC_ID_USER_FQDN:
       {
-        file = calloc (len + id_len, sizeof(char));
+        file = calloc (len + id_len, sizeof (char));
 	if (file == NULL)
 	  {
 	    log_error ("keynote_cert_obtain: failed to allocate %d bytes",