Skip to content

Commit

Permalink
whitespace cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
itojun committed Jun 11, 2002
1 parent ad6df73 commit 111ff8a
Show file tree
Hide file tree
Showing 58 changed files with 551 additions and 551 deletions.
6 changes: 3 additions & 3 deletions addrtoname.c
Expand Up @@ -23,7 +23,7 @@
*/
#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.88 2002-06-02 00:07:36 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.89 2002-06-11 17:08:37 itojun Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -299,7 +299,7 @@ lookup_emem(const u_char *ep)
}

/*
* Find the hash node that corresponds to the bytestring 'bs'
* Find the hash node that corresponds to the bytestring 'bs'
* with length 'nlen'
*/

Expand Down Expand Up @@ -458,7 +458,7 @@ linkaddr_string(const u_char *ep, const unsigned int len)

if (len == 6) /* XXX not totally correct... */
return etheraddr_string(ep);

tp = lookup_bytestring(ep, len);
if (tp->e_name)
return (tp->e_name);
Expand Down
20 changes: 10 additions & 10 deletions ieee802_11.h
@@ -1,4 +1,4 @@
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.3 2001-06-14 09:50:01 guy Exp $ (LBL) */
/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.4 2002-06-11 17:08:38 itojun Exp $ (LBL) */
/*
* Copyright (c) 2001
* Fortress Technologies
Expand Down Expand Up @@ -28,15 +28,15 @@
#define T_DATA 0x2 /* data */
#define T_RESV 0x3 /* reserved */

#define ST_ASSOC_REQUEST 0x0
#define ST_ASSOC_RESPONSE 0x1
#define ST_REASSOC_REQUEST 0x2
#define ST_REASSOC_RESPONSE 0x3
#define ST_PROBE_REQUEST 0x4
#define ST_PROBE_RESPONSE 0x5
#define ST_ASSOC_REQUEST 0x0
#define ST_ASSOC_RESPONSE 0x1
#define ST_REASSOC_REQUEST 0x2
#define ST_REASSOC_RESPONSE 0x3
#define ST_PROBE_REQUEST 0x4
#define ST_PROBE_RESPONSE 0x5
/* RESERVED 0x6 */
/* RESERVED 0x7 */
#define ST_BEACON 0x8
#define ST_BEACON 0x8
#define ST_ATIM 0x9
#define ST_DISASSOC 0xA
#define ST_AUTH 0xB
Expand All @@ -46,7 +46,7 @@
/* RESERVED 0xF */


#define CTRL_PS_POLL 0xA
#define CTRL_PS_POLL 0xA
#define CTRL_RTS 0xB
#define CTRL_CTS 0xC
#define CTRL_ACK 0xD
Expand Down Expand Up @@ -153,7 +153,7 @@ struct tim_t {
/* reserved 15 */
/* reserved 16 */

#define E_CHALLENGE 16
#define E_CHALLENGE 16
/* reserved 17 */
/* reserved 18 */
/* reserved 19 */
Expand Down
12 changes: 6 additions & 6 deletions interface.h
Expand Up @@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.185 2002-05-31 09:29:07 guy Exp $ (LBL)
* @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.186 2002-06-11 17:08:38 itojun Exp $ (LBL)
*/

#ifndef tcpdump_interface_h
Expand Down Expand Up @@ -189,11 +189,11 @@ extern const char *dnnum_string(u_short);

#include <pcap.h>

extern void ascii_print_with_offset(const u_char *, u_int, u_int);
extern void ascii_print(const u_char *, u_int);
extern void hex_print_with_offset(const u_char *, u_int, u_int);
extern void telnet_print(const u_char *, u_int);
extern void hex_print(const u_char *, u_int);
extern void ascii_print_with_offset(const u_char *, u_int, u_int);
extern void ascii_print(const u_char *, u_int);
extern void hex_print_with_offset(const u_char *, u_int, u_int);
extern void telnet_print(const u_char *, u_int);
extern void hex_print(const u_char *, u_int);
extern int ether_encap_print(u_short, const u_char *, u_int, u_int, u_short *);
extern int llc_print(const u_char *, u_int, u_int, const u_char *,
const u_char *, u_short *);
Expand Down
6 changes: 3 additions & 3 deletions ipsec_doi.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Expand All @@ -13,7 +13,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand All @@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/* YIPS @(#)$Id: ipsec_doi.h,v 1.4 2000-10-04 03:00:29 itojun Exp $ */
/* YIPS @(#)$Id: ipsec_doi.h,v 1.5 2002-06-11 17:08:39 itojun Exp $ */

/* refer to RFC 2407 */

Expand Down
4 changes: 2 additions & 2 deletions ipx.h
@@ -1,7 +1,7 @@
/*
* IPX protocol formats
* IPX protocol formats
*
* @(#) $Header: /tcpdump/master/tcpdump/ipx.h,v 1.5 2002-03-05 11:35:45 guy Exp $
* @(#) $Header: /tcpdump/master/tcpdump/ipx.h,v 1.6 2002-06-11 17:08:39 itojun Exp $
*/

/* well-known sockets */
Expand Down
6 changes: 3 additions & 3 deletions isakmp.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Expand All @@ -13,7 +13,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand All @@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/* YIPS @(#)$Id: isakmp.h,v 1.7 2000-10-03 05:16:38 itojun Exp $ */
/* YIPS @(#)$Id: isakmp.h,v 1.8 2002-06-11 17:08:39 itojun Exp $ */

/* refer to RFC 2408 */

Expand Down
10 changes: 5 additions & 5 deletions lane.h
@@ -1,6 +1,6 @@
/*
* Marko Kiiskila carnil@cs.tut.fi
*
* Marko Kiiskila carnil@cs.tut.fi
*
* Tampere University of Technology - Telecommunications Laboratory
*
* Permission to use, copy, modify and distribute this
Expand All @@ -12,15 +12,15 @@
* documentation, and that the use of this software is
* acknowledged in any publications resulting from using
* the software.
*
*
* TUT ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS
* SOFTWARE.
*
*
*/

/* $Id: lane.h,v 1.3 2000-10-03 02:54:56 itojun Exp $ */
/* $Id: lane.h,v 1.4 2002-06-11 17:08:39 itojun Exp $ */

#ifndef ETHER_ADDR_LEN
#define ETHER_ADDR_LEN 6
Expand Down
8 changes: 4 additions & 4 deletions nameser.h
@@ -1,4 +1,4 @@
/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.9 2001-06-27 05:40:16 guy Exp $ (LBL) */
/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.10 2002-06-11 17:08:40 itojun Exp $ (LBL) */
/*
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
Expand Down Expand Up @@ -34,14 +34,14 @@
* @(#)nameser.h 8.2 (Berkeley) 2/16/94
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
*
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
* the name of Digital Equipment Corporation not be used in advertising or
* publicity pertaining to distribution of the document or software without
* specific, written prior permission.
*
*
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
Expand Down Expand Up @@ -231,7 +231,7 @@ typedef struct {
*/
#define INDIR_MASK 0xc0 /* 11.... */
#define EDNS0_MASK 0x40 /* 01.... */
# define EDNS0_ELT_BITLABEL 0x01
# define EDNS0_ELT_BITLABEL 0x01

/*
* Structure for passing resource records around.
Expand Down
6 changes: 3 additions & 3 deletions oakley.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Expand All @@ -13,7 +13,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand All @@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/* YIPS @(#)$Id: oakley.h,v 1.1 1999-10-30 05:11:10 itojun Exp $ */
/* YIPS @(#)$Id: oakley.h,v 1.2 2002-06-11 17:08:40 itojun Exp $ */

/* refer to RFC 2409 */

Expand Down
4 changes: 2 additions & 2 deletions ospf6.h
@@ -1,4 +1,4 @@
/* @(#) $Header: /tcpdump/master/tcpdump/ospf6.h,v 1.3 2000-12-17 23:07:50 guy Exp $ (LBL) */
/* @(#) $Header: /tcpdump/master/tcpdump/ospf6.h,v 1.4 2002-06-11 17:08:40 itojun Exp $ (LBL) */
/*
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
Expand Down Expand Up @@ -153,7 +153,7 @@ struct lsa {
/* AS external links advertisements */
struct {
u_int32_t asla_metric;
struct lsa_prefix asla_prefix[1];
struct lsa_prefix asla_prefix[1];
/* some optional fields follow */
} un_asla;

Expand Down
4 changes: 2 additions & 2 deletions print-802_11.c
Expand Up @@ -22,7 +22,7 @@

#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.7 2002-05-13 08:30:19 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.8 2002-06-11 17:08:41 itojun Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -817,7 +817,7 @@ ieee802_11_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)

case T_DATA:
/* There may be a problem w/ AP not having this bit set */
if (FC_WEP(fc)) {
if (FC_WEP(fc)) {
if (!wep_print(p,length)) {
printf("[|802.11]");
goto out;
Expand Down
4 changes: 2 additions & 2 deletions print-ah.c
Expand Up @@ -23,7 +23,7 @@

#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.15 2001-09-17 21:57:54 fenner Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.16 2002-06-11 17:08:41 itojun Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -67,7 +67,7 @@ ah_print(register const u_char *bp, register const u_char *bp2)
if (bp + sizeof(struct ah) + sumlen > ep)
fputs("[truncated]", stdout);
fputs("): ", stdout);

return sizeof(struct ah) + sumlen;
trunc:
fputs("[|AH]", stdout);
Expand Down
4 changes: 2 additions & 2 deletions print-arcnet.c
Expand Up @@ -17,12 +17,12 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*
* From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
*/
#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.7 2002-06-01 23:50:30 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.8 2002-06-11 17:08:41 itojun Exp $ (LBL)";
#endif

#ifdef HAVE_CONFIG_H
Expand Down
6 changes: 3 additions & 3 deletions print-ascii.c
Expand Up @@ -42,7 +42,7 @@

#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.7 2002-04-24 06:55:55 guy Exp $";
"@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.8 2002-06-11 17:08:42 itojun Exp $";
#endif
#include <stdio.h>
#include <sys/types.h>
Expand All @@ -56,7 +56,7 @@ static const char rcsid[] =
#define HEXDUMP_HEXSTUFF_PER_SHORT 5 /* 4 hex digits and a space */
#define HEXDUMP_HEXSTUFF_PER_LINE \
(HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)

void
ascii_print_with_offset(register const u_char *cp, register u_int length,
register u_int oset)
Expand Down Expand Up @@ -131,7 +131,7 @@ ascii_print(register const u_char *cp, register u_int length)
{
ascii_print_with_offset(cp, length, 0);
}

/*
* telnet_print() wants this. It is essentially default_print_unaligned()
*/
Expand Down
10 changes: 5 additions & 5 deletions print-beep.c
@@ -1,8 +1,8 @@
/*
* Copyright (C) 2000, Richard Sharpe
*
* This software may be distributed either under the terms of the
* BSD-style licence that accompanies tcpdump or under the GNU GPL
* This software may be distributed either under the terms of the
* BSD-style licence that accompanies tcpdump or under the GNU GPL
* version 2 or later.
*
* print-beep.c
Expand All @@ -11,7 +11,7 @@

#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.1 2001-12-10 08:21:24 guy Exp $";
"@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.2 2002-06-11 17:08:42 itojun Exp $";
#endif

#ifdef HAVE_CONFIG_H
Expand All @@ -34,7 +34,7 @@ static const char rcsid[] =

/* Check for a string but not go beyond length
* Return TRUE on match, FALSE otherwise
*
*
* Looks at the first few chars up to tl1 ...
*/

Expand Down Expand Up @@ -68,6 +68,6 @@ beep_print(const u_char *bp, u_int length)
printf(" BEEP SEQ");
else if (l_strnstart("END", 4, bp, length))
printf(" BEEP END");
else
else
printf(" BEEP (payload or undecoded)");
}

0 comments on commit 111ff8a

Please sign in to comment.