Proper types in format strings. From <greg@nest.cx>

4 files changed, 11 insertions, 11 deletions

diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index b001c315997..8c8883b5137 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: message.c,v 1.49 2002/03/26 13:19:28 ho Exp $	*/
+/*	$OpenBSD: message.c,v 1.50 2002/05/28 10:09:46 ho Exp $	*/
 /*	$EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $	*/
 
 /*
@@ -1655,7 +1655,7 @@ message_check_duplicate (struct message *msg)
   if (!exchange)
     return 0;
 
-  LOG_DBG ((LOG_MESSAGE, 90, "message_check_duplicate: last_received 0x%x",
+  LOG_DBG ((LOG_MESSAGE, 90, "message_check_duplicate: last_received %p",
 	    exchange->last_received));
   if (exchange->last_received)
     {
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 951305849f1..8d001c156ba 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pf_key_v2.c,v 1.99 2002/05/27 04:21:38 deraadt Exp $  */
+/*      $OpenBSD: pf_key_v2.c,v 1.100 2002/05/28 10:09:46 ho Exp $  */
 /*	$EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $	*/
 
 /*
@@ -379,7 +379,7 @@ pf_key_v2_read (u_int32_t seq)
 	    {
 	      LOG_DBG ((LOG_SYSDEP, 90,
 			"pf_key_v2_read:"
-			"bad version (%d) or PID (%ld, mine is %d), ignored",
+			"bad version (%d) or PID (%d, mine is %ld), ignored",
 			msg->sadb_msg_version, msg->sadb_msg_pid,
 			(long)getpid ()));
 	      goto cleanup;
@@ -3129,7 +3129,7 @@ pf_key_v2_acquire (struct pf_key_v2_msg *pmsg)
 		  if (!pwd)
 		    {
 		      log_error ("pf_key_v2_acquire: could not acquire "
-				 "username from provided ID %d",
+				 "username from provided ID %llu",
 				 srcident->sadb_ident_id);
 		      goto fail;
 		    }
@@ -3294,7 +3294,7 @@ pf_key_v2_acquire (struct pf_key_v2_msg *pmsg)
 		  if (!pwd)
 		    {
 		      log_error ("pf_key_v2_acquire: could not acquire "
-				 "username from provided ID %d",
+				 "username from provided ID %llu",
 				 dstident->sadb_ident_id);
 		      goto fail;
 		    }
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 2fe1a5a5359..1dabcac75bb 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sa.c,v 1.55 2002/05/23 13:58:57 ho Exp $	*/
+/*	$OpenBSD: sa.c,v 1.56 2002/05/28 10:09:46 ho Exp $	*/
 /*	$EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $	*/
 
 /*
@@ -92,7 +92,7 @@ sa_init (void)
   bucket_mask = (1 << INITIAL_BUCKET_BITS) - 1;
   sa_tab = malloc ((bucket_mask + 1) * sizeof (struct sa_list));
   if (!sa_tab)
-    log_fatal ("sa_init: malloc (%s) failed",
+    log_fatal ("sa_init: malloc (%d) failed",
 	       (bucket_mask + 1) * sizeof (struct sa_list));
   for (i = 0; i <= bucket_mask; i++)
     {
diff --git a/sbin/isakmpd/timer.c b/sbin/isakmpd/timer.c
index cbf5703e335..940ac2d4ad9 100644
--- a/sbin/isakmpd/timer.c
+++ b/sbin/isakmpd/timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.c,v 1.8 2001/07/06 14:37:11 ho Exp $	*/
+/*	$OpenBSD: timer.c,v 1.9 2002/05/28 10:09:46 ho Exp $	*/
 /*	$EOM: timer.c,v 1.13 2000/02/20 19:58:42 niklas Exp $	*/
 
 /*
@@ -109,14 +109,14 @@ timer_add_event (char *name, void (*func) (void *), void *arg,
     {
       LOG_DBG ((LOG_TIMER, 10,
 		"timer_add_event: event %s(%p) added before %s(%p), "
-		"expiration in %ds", name,
+		"expiration in %lds", name,
 		arg, n->name, n->arg, expiration->tv_sec - now.tv_sec));
       TAILQ_INSERT_BEFORE (n, ev, link);
     }
   else
     {
       LOG_DBG ((LOG_TIMER, 10, "timer_add_event: event %s(%p) added last, "
-		"expiration in %ds", name, arg, 
+		"expiration in %lds", name, arg, 
 		expiration->tv_sec - now.tv_sec));
       TAILQ_INSERT_TAIL (&events, ev, link);
     }