summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dhclient.c
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-09-15 18:15:19 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-09-15 18:15:19 +0000
commitcda9108e72a0e53ca98317cf26f755763f331b0a (patch)
tree849094f9b36ae143ead80cec62df341d44062cf2 /sbin/dhclient/dhclient.c
parent6925ec5238a7a84f51ef7d1886dbadf6daa51466 (diff)
no \n in error() calls and minor KNF, from Moritz Jodeit <moritz@jodeit.org>
Diffstat (limited to 'sbin/dhclient/dhclient.c')
-rw-r--r--sbin/dhclient/dhclient.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index acb549418fc..005c91df9e5 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.58 2004/08/30 07:43:32 otto Exp $ */
+/* $OpenBSD: dhclient.c,v 1.59 2004/09/15 18:15:18 henning Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1767,7 +1767,7 @@ priv_script_init(char *reason, char *medium)
if (ip->client->scriptEnv == NULL)
error("script_init: no memory for environment");
- ip->client->scriptEnv[0]=strdup(CLIENT_PATH);
+ ip->client->scriptEnv[0] = strdup(CLIENT_PATH);
if (ip->client->scriptEnv[0] == NULL)
error("script_init: no memory for environment");
@@ -2030,7 +2030,6 @@ priv_script_go(void)
} else {
execve(scriptName, argv, envp);
error("execve (%s, ...): %m", scriptName);
- exit(0);
}
if (ip)
@@ -2305,7 +2304,7 @@ option_as_string(unsigned int code, unsigned char *data, int len)
unsigned char *dp = data;
if (code > 255)
- error("option_as_string: bad code %d\n", code);
+ error("option_as_string: bad code %d", code);
for (; dp < data + len; dp++) {
if (!isascii(*dp) || !isprint(*dp)) {