From: Ted Lemon Date: Thu, 7 Oct 1999 06:42:53 +0000 (+0000) Subject: Fix some signed/unsigned pointer incompatibilities for Digital Unix. X-Git-Tag: BCTEL_SPECIAL_19991124~131 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e703795db44e755a8c5f12980088e392f07fd1aa;p=thirdparty%2Fdhcp.git Fix some signed/unsigned pointer incompatibilities for Digital Unix. --- diff --git a/common/options.c b/common/options.c index cd1ad8a20..a89e737ac 100644 --- a/common/options.c +++ b/common/options.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: options.c,v 1.46 1999/10/07 06:35:43 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: options.c,v 1.47 1999/10/07 06:42:50 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #define DHCP_OPTION_DATA @@ -247,7 +247,7 @@ int cons_options (inpacket, outpacket, lease, mms, in_options, cfg_options, struct data_string *prl; { #define PRIORITY_COUNT 300 - int priority_list [PRIORITY_COUNT]; + unsigned priority_list [PRIORITY_COUNT]; int priority_len; unsigned char buffer [4096]; /* Really big buffer... */ unsigned main_buffer_size; diff --git a/common/parse.c b/common/parse.c index c703a43f4..4169841d0 100644 --- a/common/parse.c +++ b/common/parse.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: parse.c,v 1.44 1999/10/07 06:35:44 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: parse.c,v 1.45 1999/10/07 06:42:51 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -255,7 +255,7 @@ void parse_hardware_param (cfile, hardware) { const char *val; enum dhcp_token token; - int hlen; + unsigned hlen; unsigned char *t; token = next_token (&val, cfile); diff --git a/server/dhcp.c b/server/dhcp.c index ce5bec438..69da9895a 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.114 1999/10/07 06:36:31 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.115 1999/10/07 06:42:53 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -2411,7 +2411,7 @@ struct lease *mockup_lease (packet, share, hp) return (struct lease *)0; mock.next = mock.prev = (struct lease *)0; mock.host = hp; - (const char *)mock.uid = hp -> client_identifier.data; + (const unsigned char *)mock.uid = hp -> client_identifier.data; mock.uid_len = hp -> client_identifier.len; mock.hardware_addr = hp -> interface; mock.starts = mock.timestamp = mock.ends = MIN_TIME;