Deleted Added
full compact
nametoaddr.c (26178) nametoaddr.c (39294)
1/*
1/*
2 * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
2 * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and
9 * this paragraph in its entirety in the documentation or other materials
10 * provided with the distribution, and (3) all advertising materials mentioning

--- 8 unchanged lines hidden (view full) ---

19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Name to id translation routines used by the scanner.
22 * These functions are not time critical.
23 */
24
25#ifndef lint
26static const char rcsid[] =
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and
9 * this paragraph in its entirety in the documentation or other materials
10 * provided with the distribution, and (3) all advertising materials mentioning

--- 8 unchanged lines hidden (view full) ---

19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Name to id translation routines used by the scanner.
22 * These functions are not time critical.
23 */
24
25#ifndef lint
26static const char rcsid[] =
27 "@(#) $Header: nametoaddr.c,v 1.45 96/10/17 23:26:53 leres Exp $ (LBL)";
27 "@(#) $Header: nametoaddr.c,v 1.48 98/07/12 13:15:36 leres Exp $ (LBL)";
28#endif
29
30#include <sys/param.h>
31#include <sys/types.h> /* concession to AIX */
32#include <sys/socket.h>
33#include <sys/time.h>
34
35#if __STDC__

--- 304 unchanged lines hidden (view full) ---

340{
341 register u_char *ap;
342 u_char a[6];
343
344 ap = NULL;
345 if (ether_hostton((char *)name, (struct ether_addr *)a) == 0) {
346 ap = (u_char *)malloc(6);
347 if (ap != NULL)
28#endif
29
30#include <sys/param.h>
31#include <sys/types.h> /* concession to AIX */
32#include <sys/socket.h>
33#include <sys/time.h>
34
35#if __STDC__

--- 304 unchanged lines hidden (view full) ---

340{
341 register u_char *ap;
342 u_char a[6];
343
344 ap = NULL;
345 if (ether_hostton((char *)name, (struct ether_addr *)a) == 0) {
346 ap = (u_char *)malloc(6);
347 if (ap != NULL)
348 memcpy(ap, a, 6);
348 memcpy((char *)ap, (char *)a, 6);
349 }
350 return (ap);
351}
352#endif
353
354u_short
355__pcap_nametodnaddr(const char *name)
356{

--- 16 unchanged lines hidden ---
349 }
350 return (ap);
351}
352#endif
353
354u_short
355__pcap_nametodnaddr(const char *name)
356{

--- 16 unchanged lines hidden ---