diff options
| author | steve <steve@FreeBSD.org> | 1997-06-29 19:00:29 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1997-06-29 19:00:29 +0000 |
| commit | 0d992ff3138ae20de7a6f94dd7a46d15618900ad (patch) | |
| tree | b7f9efb7b5727705d2c745d83fd97780dc95e4c9 /libexec/rbootd/parseconf.c | |
| parent | 8d3c561e32236d0061cc1de5ec7a4224d7ec85f4 (diff) | |
| download | FreeBSD-src-0d992ff3138ae20de7a6f94dd7a46d15618900ad.zip FreeBSD-src-0d992ff3138ae20de7a6f94dd7a46d15618900ad.tar.gz | |
Merge conflicts and make this compile -Wall clean.
Diffstat (limited to 'libexec/rbootd/parseconf.c')
| -rw-r--r-- | libexec/rbootd/parseconf.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c index 7d7bce2..93c9411 100644 --- a/libexec/rbootd/parseconf.c +++ b/libexec/rbootd/parseconf.c @@ -38,15 +38,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)parseconf.c 8.1 (Berkeley) 6/4/93 - * $Id$ + * from: @(#)parseconf.c 8.1 (Berkeley) 6/4/93 + * $Id: parseconf.c,v 1.5 1997/02/22 14:21:57 peter Exp $ * - * Utah $Hdr: parseconf.c 3.1 92/07/06$ + * From: Utah Hdr: parseconf.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -static char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93"; +static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint */ #include <sys/param.h> @@ -83,7 +83,7 @@ ParseConfig() { FILE *fp; CLIENT *client; - u_char *addr; + u_int8_t *addr; char line[C_LINELEN]; register char *cp, *bcp; register int i, j; @@ -242,13 +242,12 @@ ParseConfig() ** Warnings: ** - The return value points to a static buffer; it must ** be copied if it's to be saved. -** - For speed, we assume a u_char consists of 8 bits. */ -u_char * +u_int8_t * ParseAddr(str) char *str; { - static u_char addr[RMP_ADDRLEN]; + static u_int8_t addr[RMP_ADDRLEN]; register char *cp; register unsigned i; register int part, subpart; |
