summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/conf.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-01 07:44:23 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-01 07:44:23 +0000
commitf513dc36f4e8026dcc54d6eca9240142830b7670 (patch)
treea7695df419f6006fc1e66fb26caedd25d34087d7 /sbin/isakmpd/conf.c
parent715efc5fb1f53da06a4bbf265ecf4758c59b5f52 (diff)
size_t must be cast to (unsigned long) and printed using %lu
Diffstat (limited to 'sbin/isakmpd/conf.c')
-rw-r--r--sbin/isakmpd/conf.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index f09f19d8e83..5ac87436390 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.40 2002/05/28 11:23:20 ho Exp $ */
+/* $OpenBSD: conf.c,v 1.41 2002/06/01 07:44:21 deraadt Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -202,7 +202,7 @@ conf_set_now (char *section, char *tag, char *value, int override,
node = calloc (1, sizeof *node);
if (!node)
{
- log_error ("conf_set: calloc (1, %d) failed", sizeof *node);
+ log_error ("conf_set: calloc (1, %lu) failed", (unsigned long)sizeof *node);
return 1;
}
node->section = strdup (section);
@@ -593,15 +593,15 @@ conf_reinit (void)
new_conf_addr = malloc (sz);
if (!new_conf_addr)
{
- log_error ("conf_reinit: malloc (%d) failed", sz);
+ log_error ("conf_reinit: malloc (%lu) failed", (unsigned long)sz);
goto fail;
}
/* XXX I assume short reads won't happen here. */
if (read (fd, new_conf_addr, sz) != sz)
{
- log_error ("conf_reinit: read (%d, %p, %d) failed",
- fd, new_conf_addr, sz);
+ log_error ("conf_reinit: read (%d, %p, %lu) failed",
+ fd, new_conf_addr, (unsigned long)sz);
goto fail;
}
close (fd);
@@ -921,7 +921,8 @@ conf_trans_node (int transaction, enum conf_op op)
node = calloc (1, sizeof *node);
if (!node)
{
- log_error ("conf_trans_node: calloc (1, %d) failed", sizeof *node);
+ log_error ("conf_trans_node: calloc (1, %lu) failed",
+ (unsigned long)sizeof *node);
return 0;
}
node->trans = transaction;