summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-01-30 22:48:39 +0000
committerEric Andersen <andersen@codepoet.org>2006-01-30 22:48:39 +0000
commita68ea1cb93c29125bc4f30ddd415fca02249e010 (patch)
tree5741be315758b807145c24da9ff3a1dbf8fce4e8 /networking
parent9a58b02ec75caafb7214f1ad0317f9a4830cbd2a (diff)
downloadbusybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.tar.gz
busybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.tar.bz2
busybox-w32-a68ea1cb93c29125bc4f30ddd415fca02249e010.zip
fix up yet more annoying signed/unsigned and mixed type errors
Diffstat (limited to 'networking')
-rw-r--r--networking/udhcp/dhcpc.c8
-rw-r--r--networking/udhcp/packet.c2
-rw-r--r--networking/udhcp/serverpacket.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index a4afb0c46..8568ac1e7 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
220 client_config.clientid[OPT_CODE] = DHCP_CLIENT_ID; 220 client_config.clientid[OPT_CODE] = DHCP_CLIENT_ID;
221 client_config.clientid[OPT_LEN] = len; 221 client_config.clientid[OPT_LEN] = len;
222 client_config.clientid[OPT_DATA] = '\0'; 222 client_config.clientid[OPT_DATA] = '\0';
223 strncpy(client_config.clientid + OPT_DATA, optarg, len); 223 strncpy((char*)client_config.clientid + OPT_DATA, optarg, len);
224 break; 224 break;
225 case 'C': 225 case 'C':
226 if (client_config.clientid) show_usage(); 226 if (client_config.clientid) show_usage();
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
232 client_config.vendorclass = xmalloc(len + 2); 232 client_config.vendorclass = xmalloc(len + 2);
233 client_config.vendorclass[OPT_CODE] = DHCP_VENDOR; 233 client_config.vendorclass[OPT_CODE] = DHCP_VENDOR;
234 client_config.vendorclass[OPT_LEN] = len; 234 client_config.vendorclass[OPT_LEN] = len;
235 strncpy(client_config.vendorclass + OPT_DATA, optarg, len); 235 strncpy((char*)client_config.vendorclass + OPT_DATA, optarg, len);
236 break; 236 break;
237 case 'f': 237 case 'f':
238 client_config.foreground = 1; 238 client_config.foreground = 1;
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
247 client_config.hostname = xmalloc(len + 2); 247 client_config.hostname = xmalloc(len + 2);
248 client_config.hostname[OPT_CODE] = DHCP_HOST_NAME; 248 client_config.hostname[OPT_CODE] = DHCP_HOST_NAME;
249 client_config.hostname[OPT_LEN] = len; 249 client_config.hostname[OPT_LEN] = len;
250 strncpy(client_config.hostname + 2, optarg, len); 250 strncpy((char*)client_config.hostname + 2, optarg, len);
251 break; 251 break;
252 case 'F': 252 case 'F':
253 len = strlen(optarg) > 255 ? 255 : strlen(optarg); 253 len = strlen(optarg) > 255 ? 255 : strlen(optarg);
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
264 client_config.fqdn[OPT_LEN + 1] = 0x1; 264 client_config.fqdn[OPT_LEN + 1] = 0x1;
265 client_config.fqdn[OPT_LEN + 2] = 0; 265 client_config.fqdn[OPT_LEN + 2] = 0;
266 client_config.fqdn[OPT_LEN + 3] = 0; 266 client_config.fqdn[OPT_LEN + 3] = 0;
267 strncpy(client_config.fqdn + 5, optarg, len); 267 strncpy((char*)client_config.fqdn + 5, optarg, len);
268 break; 268 break;
269 case 'i': 269 case 'i':
270 client_config.interface = optarg; 270 client_config.interface = optarg;
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 64a910031..1baec55e2 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -70,7 +70,7 @@ int get_packet(struct dhcpMessage *packet, int fd)
70 if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) { 70 if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) {
71 for (i = 0; broken_vendors[i][0]; i++) { 71 for (i = 0; broken_vendors[i][0]; i++) {
72 if (vendor[OPT_LEN - 2] == (uint8_t) strlen(broken_vendors[i]) && 72 if (vendor[OPT_LEN - 2] == (uint8_t) strlen(broken_vendors[i]) &&
73 !strncmp(vendor, broken_vendors[i], vendor[OPT_LEN - 2])) { 73 !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
74 DEBUG(LOG_INFO, "broken client (%s), forcing broadcast", 74 DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
75 broken_vendors[i]); 75 broken_vendors[i]);
76 packet->flags |= htons(BROADCAST_FLAG); 76 packet->flags |= htons(BROADCAST_FLAG);
diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c
index 1b89862b2..fe880b4a0 100644
--- a/networking/udhcp/serverpacket.c
+++ b/networking/udhcp/serverpacket.c
@@ -98,9 +98,9 @@ static void add_bootp_options(struct dhcpMessage *packet)
98{ 98{
99 packet->siaddr = server_config.siaddr; 99 packet->siaddr = server_config.siaddr;
100 if (server_config.sname) 100 if (server_config.sname)
101 strncpy(packet->sname, server_config.sname, sizeof(packet->sname) - 1); 101 strncpy((char*)packet->sname, server_config.sname, sizeof(packet->sname) - 1);
102 if (server_config.boot_file) 102 if (server_config.boot_file)
103 strncpy(packet->file, server_config.boot_file, sizeof(packet->file) - 1); 103 strncpy((char*)packet->file, server_config.boot_file, sizeof(packet->file) - 1);
104} 104}
105 105
106 106