summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorTed Lemon <source@isc.org>1999-10-12 16:00:34 +0000
committerTed Lemon <source@isc.org>1999-10-12 16:00:34 +0000
commitab58ff49e0838287e22ad6b68b226a3ced25d7c6 (patch)
treebf0f33398c77e0a15a10dc122624aa763b0a747d /client
parenta414e627d890c85aab29446240ce1f423abffc59 (diff)
downloadisc-dhcp-ab58ff49e0838287e22ad6b68b226a3ced25d7c6.tar.gz
Fix up args to printf-like functions (thanks to Pedro Ribiero).
Diffstat (limited to 'client')
-rw-r--r--client/clparse.c4
-rw-r--r--client/dhclient.c17
2 files changed, 12 insertions, 9 deletions
diff --git a/client/clparse.c b/client/clparse.c
index c6c8b52c..7f12b3b5 100644
--- a/client/clparse.c
+++ b/client/clparse.c
@@ -22,7 +22,7 @@
#ifndef lint
static char copyright[] =
-"$Id: clparse.c,v 1.36 1999/10/07 06:35:35 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n";
+"$Id: clparse.c,v 1.37 1999/10/12 16:00:17 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -559,7 +559,7 @@ void parse_option_list (cfile, list)
break;
}
if (i == 256) {
- parse_warn (cfile, "%s: expected option name.");
+ parse_warn (cfile, "%s: expected option name.", val);
skip_to_semi (cfile);
return;
}
diff --git a/client/dhclient.c b/client/dhclient.c
index 256aa793..4035c87b 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -22,7 +22,7 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.84 1999/10/07 06:35:36 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.85 1999/10/12 16:00:18 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -673,9 +673,9 @@ void bind_lease (client)
add_timeout (client -> active -> renewal,
state_bound, client);
- log_info ("bound to %s -- renewal in %d seconds.",
+ log_info ("bound to %s -- renewal in %ld seconds.",
piaddr (client -> active -> address),
- client -> active -> renewal - cur_time);
+ (long)(client -> active -> renewal - cur_time));
client -> state = S_BOUND;
reinitialize_interfaces ();
go_daemon ();
@@ -1205,9 +1205,11 @@ void state_panic (cpp)
if (cur_time <
client -> active -> renewal) {
client -> state = S_BOUND;
- log_info ("bound: renewal in %d seconds.",
- client -> active -> renewal
- - cur_time);
+ log_info ("bound: renewal in %s %ld.",
+ "seconds",
+ (long)
+ (client -> active -> renewal
+ - cur_time));
add_timeout ((client ->
active -> renewal),
state_bound, client);
@@ -2138,7 +2140,8 @@ char *dhcp_option_ev_name (option)
int i;
if (strlen (option -> name) + 1 > sizeof evbuf)
- log_fatal ("option %s name is larger than static buffer.");
+ log_fatal ("option %s name is larger than static buffer.",
+ option -> name);
for (i = 0; option -> name [i]; i++) {
if (option -> name [i] == '-')
evbuf [i] = '_';