diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | alignment.h | 29 | ||||
| -rw-r--r-- | packet-msproxy.c | 3 | ||||
| -rw-r--r-- | packet-smb-browse.c | 3 | ||||
| -rw-r--r-- | packet-smb-common.h | 3 | ||||
| -rw-r--r-- | packet-smb.c | 3 | ||||
| -rw-r--r-- | packet-socks.c | 3 |
7 files changed, 6 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 6519b59cf2..61a4ceee6e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.684 2004/01/10 02:38:38 obiot Exp $ +# $Id: Makefile.am,v 1.685 2004/01/10 02:43:28 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -781,7 +781,6 @@ ETHEREAL_COMMON_SRC = \ afn.c \ afn.h \ aftypes.h \ - alignment.h \ arcnet_pids.h \ asn1.c \ asn1.h \ diff --git a/alignment.h b/alignment.h deleted file mode 100644 index 5918638885..0000000000 --- a/alignment.h +++ /dev/null @@ -1,29 +0,0 @@ - /* - * alignment.h, Copyright, 1998, Richard Sharpe, All Rights Reserved - * - * $Id: alignment.h,v 1.4 2002/08/28 21:00:05 jmayer Exp $ - * - * Please see the file COPYING in the top level for details of copying - * this software. Use of this software is approved only under certain - * conditions. - * - * This file implements the alignment macros for the Threaded SMB Server - * - * For the moment we assume Intel style architecture, but can support - * others. - * - * Modification History - * - * 16-Oct-1998, RJS, Initial Coding - * - */ - -#ifndef __ALIGNMENT_H -#define __ALIGNMENT_H - -#define GBYTE(buf, pos) (unsigned char)((char)buf[pos]) -#define GSHORT(buf, pos) pletohs(&buf[pos]) -#define GSSHORT(buf, pos) (signed)pletohs(&buf[pos]) -#define GWORD(buf, pos) pletohl(&buf[pos]) - -#endif diff --git a/packet-msproxy.c b/packet-msproxy.c index afb6903d0c..764d7c619d 100644 --- a/packet-msproxy.c +++ b/packet-msproxy.c @@ -2,7 +2,7 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-msproxy.c,v 1.36 2003/11/08 00:02:55 guy Exp $ + * $Id: packet-msproxy.c,v 1.37 2004/01/10 02:43:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,7 +51,6 @@ #include <epan/packet.h> #include <epan/resolv.h> -#include "alignment.h" #include <epan/conversation.h> #include "packet-tcp.h" diff --git a/packet-smb-browse.c b/packet-smb-browse.c index 26bba10705..85c38e3d9a 100644 --- a/packet-smb-browse.c +++ b/packet-smb-browse.c @@ -2,7 +2,7 @@ * Routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.c,v 1.34 2003/11/19 03:53:32 guy Exp $ + * $Id: packet-smb-browse.c,v 1.35 2004/01/10 02:43:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,6 @@ #include <ctype.h> #include <epan/packet.h> #include "smb.h" -#include "alignment.h" #include "packet-smb-browse.h" #include "packet-dcerpc.h" diff --git a/packet-smb-common.h b/packet-smb-common.h index ec43fbe8d2..04a4dba43c 100644 --- a/packet-smb-common.h +++ b/packet-smb-common.h @@ -2,7 +2,7 @@ * Routines for SMB packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-common.h,v 1.24 2003/05/21 10:16:10 sahlberg Exp $ + * $Id: packet-smb-common.h,v 1.25 2004/01/10 02:43:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,6 @@ #include <epan/packet.h> #include <epan/conversation.h> #include "smb.h" -#include "alignment.h" int dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset); diff --git a/packet-smb.c b/packet-smb.c index 0df5bdb688..f03fa7a556 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.383 2004/01/02 23:44:20 guy Exp $ + * $Id: packet-smb.c,v 1.384 2004/01/10 02:43:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -40,7 +40,6 @@ #include <epan/packet.h> #include <epan/conversation.h> #include "smb.h" -#include "alignment.h" #include <epan/strutil.h> #include "prefs.h" #include "reassemble.h" diff --git a/packet-socks.c b/packet-socks.c index 9b232a975a..9fe818e700 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.54 2003/12/30 00:22:38 guy Exp $ + * $Id: packet-socks.c,v 1.55 2004/01/10 02:43:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -71,7 +71,6 @@ #include <epan/packet.h> #include <epan/resolv.h> -#include "alignment.h" #include <epan/conversation.h> #include "packet-tcp.h" |