From 107be66741a6b6f12c3bcedabd0c8c35778934ad Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 29 Apr 2009 17:46:47 +0000 Subject: [PATCH] =?UTF-8?q?Merge=2040118=20from=20amd64-branch:=20%m=20is?= =?UTF-8?q?=20a=20glibc=20extension,=20convert=20it=20to=20"%s",=20strerro?= =?UTF-8?q?r(errno).=20and=20fix=2064bit=20build=20of=20dhcp=20service=20(?= =?UTF-8?q?Samuel=20Serapi=C3=B3n)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=40736 --- reactos/base/services/dhcp/dhclient.c | 24 ++++++++++++------------ reactos/base/services/dhcp/dispatch.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/reactos/base/services/dhcp/dhclient.c b/reactos/base/services/dhcp/dhclient.c index 60e1b5fe084..0be54d9bfb8 100644 --- a/reactos/base/services/dhcp/dhclient.c +++ b/reactos/base/services/dhcp/dhclient.c @@ -606,7 +606,7 @@ bind_lease(struct interface_info *ip) note("bound to %s -- renewal in %ld seconds.", piaddr(ip->client->active->address), - ip->client->active->renewal - cur_time); + (long int)(ip->client->active->renewal - cur_time)); ip->client->state = S_BOUND; @@ -1035,7 +1035,7 @@ send_discover(void *ipp) note("DHCPDISCOVER on %s to %s port %d interval %ld", ip->name, inet_ntoa(sockaddr_broadcast.sin_addr), - ntohs(sockaddr_broadcast.sin_port), ip->client->interval); + ntohs(sockaddr_broadcast.sin_port), (long int)ip->client->interval); /* Send out a packet. */ (void)send_packet(ip, &ip->client->packet, ip->client->packet_length, @@ -1088,8 +1088,8 @@ state_panic(void *ipp) ip->client->active->renewal) { ip->client->state = S_BOUND; note("bound: renewal in %ld seconds.", - ip->client->active->renewal - - cur_time); + (long int)(ip->client->active->renewal - + cur_time)); add_timeout( ip->client->active->renewal, state_bound, ip); @@ -1563,7 +1563,7 @@ rewrite_client_leases(void) if (!leaseFile) { leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %m", path_dhclient_db); + error("can't create %s: %s", path_dhclient_db, strerror(errno)); } else { fflush(leaseFile); rewind(leaseFile); @@ -1600,7 +1600,7 @@ write_client_lease(struct interface_info *ip, struct client_lease *lease, if (!leaseFile) { /* XXX */ leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %m", path_dhclient_db); + error("can't create %s: %s", path_dhclient_db, strerror(errno)); } fprintf(leaseFile, "lease {\n"); @@ -1655,7 +1655,7 @@ script_init(char *reason, struct string_list *medium) sizeof(size_t) + strlen(reason); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1667,10 +1667,10 @@ script_init(char *reason, struct string_list *medium) errs += buf_add(buf, reason, len); if (errs) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(privfd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); } void @@ -1848,7 +1848,7 @@ script_write_params(char *prefix, struct client_lease *lease) scripttime = time(NULL); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1868,10 +1868,10 @@ script_write_params(char *prefix, struct client_lease *lease) } if (errs) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(privfd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); } int diff --git a/reactos/base/services/dhcp/dispatch.c b/reactos/base/services/dhcp/dispatch.c index 5bf9410cee5..b88d5e26956 100644 --- a/reactos/base/services/dhcp/dispatch.c +++ b/reactos/base/services/dhcp/dispatch.c @@ -186,7 +186,7 @@ dispatch(void) time(&cur_time); continue; } else { - error("poll: %m"); + error("poll: %s", strerror(errno)); break; } }