summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorThomas Nordin <nordin@cvs.openbsd.org>2002-06-11 06:01:20 +0000
committerThomas Nordin <nordin@cvs.openbsd.org>2002-06-11 06:01:20 +0000
commit7dead3fdf5c5ae2dcd24076c6a84f113d5f1cd19 (patch)
treeec467638662f7b07a7eb38d83439c35b0f0f8f93 /usr.sbin
parentfb895669d69e531596c6b2397db03d4016f12838 (diff)
Remove \n from warn(3). ok deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/dhcp/common/options.c6
-rw-r--r--usr.sbin/dhcp/common/parse.c6
-rw-r--r--usr.sbin/dhcp/dhclient/dhclient.c4
-rw-r--r--usr.sbin/dhcp/relay/dhcrelay.c2
-rw-r--r--usr.sbin/dhcp/server/dhcpd.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/dhcp/common/options.c b/usr.sbin/dhcp/common/options.c
index a07a0dc6656..e347da37203 100644
--- a/usr.sbin/dhcp/common/options.c
+++ b/usr.sbin/dhcp/common/options.c
@@ -481,7 +481,7 @@ char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
/* Figure out the size of the data. */
for (i = 0; dhcp_options [code].format [i]; i++) {
if (!numhunk) {
- warn ("%s: Excess information in format string: %s\n",
+ warn ("%s: Excess information in format string: %s",
dhcp_options [code].name,
&(dhcp_options [code].format [i]));
break;
@@ -533,7 +533,7 @@ char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
case 'e':
break;
default:
- warn ("%s: garbage in format string: %s\n",
+ warn ("%s: garbage in format string: %s",
dhcp_options [code].name,
&(dhcp_options [code].format [i]));
break;
@@ -558,7 +558,7 @@ char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
numhunk = len / hunksize;
/* See if we got an exact number of hunks. */
if (numhunk > 0 && numhunk * hunksize < len)
- warn ("%s: %d extra bytes at end of array\n",
+ warn ("%s: %d extra bytes at end of array",
dhcp_options [code].name,
len - numhunk * hunksize);
diff --git a/usr.sbin/dhcp/common/parse.c b/usr.sbin/dhcp/common/parse.c
index 0ffc4b09337..1f1934f78fc 100644
--- a/usr.sbin/dhcp/common/parse.c
+++ b/usr.sbin/dhcp/common/parse.c
@@ -418,7 +418,7 @@ void convert_num (buf, str, base, size)
break;
}
if (tval >= base) {
- warn ("Bogus number: %s: digit %d not in base %d\n",
+ warn ("Bogus number: %s: digit %d not in base %d",
str, tval, base);
break;
}
@@ -458,7 +458,7 @@ void convert_num (buf, str, base, size)
putLong (buf, -(unsigned long)val);
break;
default:
- warn ("Unexpected integer size: %d\n", size);
+ warn ("Unexpected integer size: %d", size);
break;
}
} else {
@@ -473,7 +473,7 @@ void convert_num (buf, str, base, size)
putULong (buf, val);
break;
default:
- warn ("Unexpected integer size: %d\n", size);
+ warn ("Unexpected integer size: %d", size);
break;
}
}
diff --git a/usr.sbin/dhcp/dhclient/dhclient.c b/usr.sbin/dhcp/dhclient/dhclient.c
index ac013d02fc8..4ab63408cdb 100644
--- a/usr.sbin/dhcp/dhclient/dhclient.c
+++ b/usr.sbin/dhcp/dhclient/dhclient.c
@@ -897,7 +897,7 @@ struct client_lease *packet_to_lease (packet)
lease = (struct client_lease *)malloc (sizeof (struct client_lease));
if (!lease) {
- warn ("dhcpoffer: no memory to record lease.\n");
+ warn ("dhcpoffer: no memory to record lease.");
return (struct client_lease *)0;
}
@@ -910,7 +910,7 @@ struct client_lease *packet_to_lease (packet)
(unsigned char *)
malloc (packet->options [i].len + 1);
if (!lease->options [i].data) {
- warn ("dhcpoffer: no memory for option %d\n",
+ warn ("dhcpoffer: no memory for option %d",
i);
free_client_lease (lease);
return (struct client_lease *)0;
diff --git a/usr.sbin/dhcp/relay/dhcrelay.c b/usr.sbin/dhcp/relay/dhcrelay.c
index 50390ee78cf..876b7e7bd18 100644
--- a/usr.sbin/dhcp/relay/dhcrelay.c
+++ b/usr.sbin/dhcp/relay/dhcrelay.c
@@ -291,7 +291,7 @@ void relay (ip, packet, length, from_port, from, hfrom)
break;
}
if (!out) {
- warn ("packet to bogus giaddr %s.\n",
+ warn ("packet to bogus giaddr %s.",
inet_ntoa (packet -> giaddr));
return;
}
diff --git a/usr.sbin/dhcp/server/dhcpd.c b/usr.sbin/dhcp/server/dhcpd.c
index 6a8dbd179c2..01290ce9f8d 100644
--- a/usr.sbin/dhcp/server/dhcpd.c
+++ b/usr.sbin/dhcp/server/dhcpd.c
@@ -326,7 +326,7 @@ void lease_pinged (from, packet, length)
}
if (!lp -> state && ! lp -> releasing) {
- warn ("ICMP Echo Reply for %s arrived late or is spurious.\n",
+ warn ("ICMP Echo Reply for %s arrived late or is spurious.",
piaddr (from));
return;
}