Removed trailing whitespaces from .h and .c files using the

winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6116

84 files changed, 538 insertions, 538 deletions

diff --git a/epan/acconfig.h b/epan/acconfig.h
index 17ef7ea63a..86a955d873 100644
--- a/epan/acconfig.h
+++ b/epan/acconfig.h
@@ -1,23 +1,23 @@
 /* acconfig.h
  * #ifdefs to be controlled by "configure"
  *
- * $Id: acconfig.h,v 1.2 2001/10/28 01:27:59 guy Exp $
+ * $Id: acconfig.h,v 1.3 2002/08/28 20:40:43 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/atalk-utils.c b/epan/atalk-utils.c
index b2a861587e..489eec674d 100644
--- a/epan/atalk-utils.c
+++ b/epan/atalk-utils.c
@@ -1,7 +1,7 @@
 /* atalk-utils.c
  * Routines for Appletalk utilities (DDP, currently).
  *
- * $Id: atalk-utils.c,v 1.2 2002/06/28 20:13:03 guy Exp $
+ * $Id: atalk-utils.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
@@ -9,12 +9,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/atalk-utils.h b/epan/atalk-utils.h
index 23ad70730a..5572cbf623 100644
--- a/epan/atalk-utils.h
+++ b/epan/atalk-utils.h
@@ -1,18 +1,18 @@
 /* atalk-utils.h
  * Definitions for Appletalk utilities (DDP, currently).
  *
- * $Id: atalk-utils.h,v 1.2 2002/06/28 20:13:03 guy Exp $
+ * $Id: atalk-utils.h,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/bitswap.c b/epan/bitswap.c
index 73ae4242a9..42a18914cf 100644
--- a/epan/bitswap.c
+++ b/epan/bitswap.c
@@ -1,23 +1,23 @@
 /* bitswap.c
  * Table of bit-swapped values of bytes
  *
- * $Id: bitswap.c,v 1.1 2000/11/15 09:37:51 guy Exp $
+ * $Id: bitswap.c,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/bitswap.h b/epan/bitswap.h
index b07dd568e7..7042779aae 100644
--- a/epan/bitswap.h
+++ b/epan/bitswap.h
@@ -1,23 +1,23 @@
 /* bitswap.h
  * Macro to bitswap a byte by looking it up in a table
  *
- * $Id: bitswap.h,v 1.1 2000/11/15 09:37:51 guy Exp $
+ * $Id: bitswap.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/column-utils.c b/epan/column-utils.c
index acdd153528..e21059ae77 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1,22 +1,22 @@
 /* column-utils.c
  * Routines for column utilities.
  *
- * $Id: column-utils.c,v 1.17 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: column-utils.c,v 1.18 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -41,7 +41,7 @@
 #include "packet_info.h"
 #include "pint.h"
 #include "resolv.h"
-#include "ipv6-utils.h" 
+#include "ipv6-utils.h"
 #include "osi-utils.h"
 
 /* Allocate all the data structures for constructing column data, given
@@ -62,7 +62,7 @@ col_init(column_info *col_info, gint num_cols)
 
 #if 0
 /*
- * This function does not appear to be used anywhere...  
+ * This function does not appear to be used anywhere...
  */
 gboolean
 col_get_writable(column_info *cinfo)
@@ -120,7 +120,7 @@ col_clear(column_info *cinfo, gint el) {
 void
 col_set_str(column_info *cinfo, gint el, gchar* str) {
   int i;
-  
+
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el])
       cinfo->col_data[i] = str;
@@ -138,7 +138,7 @@ col_add_fstr(column_info *cinfo, gint el, gchar *format, ...) {
 	max_len = COL_MAX_INFO_LEN;
   else
 	max_len = COL_MAX_LEN;
-  
+
   va_start(ap, format);
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el]) {
@@ -155,12 +155,12 @@ col_append_fstr(column_info *cinfo, gint el, gchar *format, ...) {
   va_list ap;
   int     i;
   size_t  len, max_len;
-  
+
   if (el == COL_INFO)
 	max_len = COL_MAX_INFO_LEN;
   else
 	max_len = COL_MAX_LEN;
-  
+
   va_start(ap, format);
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el]) {
@@ -189,12 +189,12 @@ col_prepend_fstr(column_info *cinfo, gint el, gchar *format, ...)
   char    orig_buf[COL_BUF_MAX_LEN];
   char   *orig;
   size_t  max_len;
-  
+
   if (el == COL_INFO)
 	max_len = COL_MAX_INFO_LEN;
   else
 	max_len = COL_MAX_LEN;
-  
+
   va_start(ap, format);
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el]) {
@@ -226,7 +226,7 @@ col_add_str(column_info *cinfo, gint el, const gchar* str) {
 	max_len = COL_MAX_INFO_LEN;
   else
 	max_len = COL_MAX_LEN;
-  
+
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el]) {
       strncpy(cinfo->col_buf[i], str, max_len);
@@ -245,7 +245,7 @@ col_append_str(column_info *cinfo, gint el, gchar* str) {
 	max_len = COL_MAX_INFO_LEN;
   else
 	max_len = COL_MAX_LEN;
-  
+
   for (i = 0; i < cinfo->num_cols; i++) {
     if (cinfo->fmt_matx[i][el]) {
       if (cinfo->col_data[i] != cinfo->col_buf[i]) {
@@ -496,7 +496,7 @@ col_set_port(packet_info *pinfo, int col, port_type ptype, guint32 port,
     else
       snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%u", port);
     break;
-    
+
   case PT_TCP:
     if (is_res)
       strncpy(pinfo->cinfo->col_buf[col], get_tcp_port(port), COL_MAX_LEN);
diff --git a/epan/column-utils.h b/epan/column-utils.h
index a0a230991d..64ceee70ea 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -1,22 +1,22 @@
 /* column-utils.h
  * Definitions for column utility structures and routines
  *
- * $Id: column-utils.h,v 1.6 2002/01/29 08:44:49 guy Exp $
+ * $Id: column-utils.h,v 1.7 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/column_info.h b/epan/column_info.h
index cfe0c24a5c..e645fbb2fd 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -1,23 +1,23 @@
 /* column.h
  * Definitions for column structures and routines
  *
- * $Id: column_info.h,v 1.2 2002/01/11 08:21:00 guy Exp $
+ * $Id: column_info.h,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/conversation.c b/epan/conversation.c
index 38ee4cb679..566ea3bb63 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -1,22 +1,22 @@
 /* conversation.c
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.c,v 1.19 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: conversation.c,v 1.20 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -56,7 +56,7 @@ static GHashTable *conversation_hashtable_no_addr2_or_port2 = NULL;
 static GMemChunk *conversation_key_chunk = NULL;
 static GMemChunk *conversation_chunk = NULL;
 
-#ifdef __NOT_USED__ 
+#ifdef __NOT_USED__
 typedef struct conversation_key {
 	struct conversation_key *next;
 	address	addr1;
@@ -91,7 +91,7 @@ static GMemChunk *conv_proto_data_area = NULL;
  * Compute the hash value for two given address/port pairs if the match
  * is to be exact.
  */
-static guint 
+static guint
 conversation_hash_exact(gconstpointer v)
 {
 	conversation_key *key = (conversation_key *)v;
@@ -160,7 +160,7 @@ conversation_match_exact(gconstpointer v, gconstpointer w)
 
 	/*
 	 * The addresses or the ports don't match.
-	 */	
+	 */
 	return 0;
 }
 
@@ -168,7 +168,7 @@ conversation_match_exact(gconstpointer v, gconstpointer w)
  * Compute the hash value for two given address/port pairs if the match
  * has a wildcard address 2.
  */
-static guint 
+static guint
 conversation_hash_no_addr2(gconstpointer v)
 {
 	conversation_key *key = (conversation_key *)v;
@@ -218,7 +218,7 @@ conversation_match_no_addr2(gconstpointer v, gconstpointer w)
 
 	/*
 	 * The addresses or the ports don't match.
-	 */	
+	 */
 	return 0;
 }
 
@@ -226,7 +226,7 @@ conversation_match_no_addr2(gconstpointer v, gconstpointer w)
  * Compute the hash value for two given address/port pairs if the match
  * has a wildcard port 2.
  */
-static guint 
+static guint
 conversation_hash_no_port2(gconstpointer v)
 {
 	conversation_key *key = (conversation_key *)v;
@@ -277,7 +277,7 @@ conversation_match_no_port2(gconstpointer v, gconstpointer w)
 
 	/*
 	 * The addresses or the ports don't match.
-	 */	
+	 */
 	return 0;
 }
 
@@ -285,7 +285,7 @@ conversation_match_no_port2(gconstpointer v, gconstpointer w)
  * Compute the hash value for two given address/port pairs if the match
  * has a wildcard address 2 and port 2.
  */
-static guint 
+static guint
 conversation_hash_no_addr2_or_port2(gconstpointer v)
 {
 	conversation_key *key = (conversation_key *)v;
@@ -331,7 +331,7 @@ conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w)
 
 	/*
 	 * The addresses or the ports don't match.
-	 */	
+	 */
 	return 0;
 }
 
@@ -512,7 +512,7 @@ conversation_set_port2(conversation_t *conv, guint32 port)
 		g_hash_table_insert(conversation_hashtable_exact,
 		    conv->key_ptr, conv);
 	}
-} 
+}
 
 /*
  * Set the address 2 value in a key.  Remove the original from
@@ -566,7 +566,7 @@ conversation_lookup_hashtable(GHashTable *hashtable, address *addr1, address *ad
 	key.port2 = port2;
 	return g_hash_table_lookup(hashtable, &key);
 }
- 
+
 
 /*
  * Given two address/port pairs for a packet, search for a conversation
@@ -655,7 +655,7 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype,
 			 * oriented protocols, the endpoints of a connection
 			 * have only one address each, i.e. you don't get
 			 * packets in a given direction coming from more than
-			 * one address.) 
+			 * one address.)
 			 */
 			if (!(options & NO_ADDR_B) && ptype != PT_UDP)
 				conversation_set_addr2(conversation, addr_b);
@@ -922,7 +922,7 @@ try_conversation_dissector(address *addr_a, address *addr_b, port_type ptype,
 
 	conversation = find_conversation(addr_a, addr_b, ptype, port_a,
 	    port_b, 0);
-	
+
 	if (conversation != NULL) {
 		if (conversation->dissector_handle == NULL){
 			pinfo->can_desegment=saved_can_desegment;
diff --git a/epan/conversation.h b/epan/conversation.h
index 517af05e8f..acc16165bb 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -1,22 +1,22 @@
 /* conversation.h
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.h,v 1.9 2001/11/27 07:13:32 guy Exp $
+ * $Id: conversation.h,v 1.10 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -25,14 +25,14 @@
 #ifndef __CONVERSATION_H__
 #define __CONVERSATION_H__
 
-/* 
+/*
  * Flags to pass to "conversation_new()" to indicate that the address 2
  * and/or port 2 values for the conversation should be wildcards.
  */
 #define NO_ADDR2 0x01
 #define NO_PORT2 0x02
 
-/* 
+/*
  * Flags to pass to "find_conversation()" to indicate that the address B
  * and/or port B search arguments are wildcards.
  */
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 4397e001c1..faf4e7cc90 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,20 +1,20 @@
 /*
- * $Id: dfilter-int.h,v 1.6 2002/04/29 07:55:32 guy Exp $
+ * $Id: dfilter-int.h,v 1.7 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index e76029c225..d656d4f00b 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,20 +1,20 @@
 /*
- * $Id: dfilter.c,v 1.10 2002/05/09 23:50:30 gram Exp $
+ * $Id: dfilter.c,v 1.11 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -245,7 +245,7 @@ dfilter_compile(gchar *text, dfilter_t **dfp)
 
 		/* Create bytecode */
 		dfw_gencode(dfw);
-	
+
 		/* Tuck away the bytecode in the dfilter_t */
 		dfilter = dfilter_new();
 		dfilter->insns = dfw->insns;
@@ -305,7 +305,7 @@ dfilter_prime_proto_tree(dfilter_t *df, proto_tree *tree)
         proto_tree_prime_hfid(tree, df->interesting_fields[i]);
     }
 }
-                
+
 
 void
 dfilter_dump(dfilter_t *df)
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index 2956547d16..48c5f5c15f 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,20 +1,20 @@
 /*
- * $Id: dfilter.h,v 1.5 2002/05/09 23:50:30 gram Exp $
+ * $Id: dfilter.h,v 1.6 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index bab20e3564..4b817f1944 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -1,21 +1,21 @@
 /*
- * $Id: dfvm.c,v 1.7 2002/05/09 23:50:30 gram Exp $
+ * $Id: dfvm.c,v 1.8 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index 53dd9b46d6..526342bf1f 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,20 +1,20 @@
 /*
- * $Id: dfvm.h,v 1.6 2002/05/09 23:50:30 gram Exp $
+ * $Id: dfvm.h,v 1.7 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -67,7 +67,7 @@ typedef enum {
 	ANY_LT,
 	ANY_LE,
 	MK_RANGE
-	
+
 } dfvm_opcode_t;
 
 typedef struct {
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index a67e2c4b06..7e03790434 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.c
@@ -1,8 +1,8 @@
 /* drange.c
  * Routines for providing general range support to the dfilter library
  *
- * $Id: drange.c,v 1.3 2002/03/02 20:48:11 guy Exp $
- * 
+ * $Id: drange.c,v 1.4 2002/08/28 20:40:55 jmayer Exp $
+ *
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
  * Ethereal - Network traffic analyzer
@@ -46,7 +46,7 @@ drange_node_free(drange_node* drnode)
   g_free(drnode);
 }
 
-/* drange_node accessors */  
+/* drange_node accessors */
 gint
 drange_node_get_start_offset(drange_node* drnode)
 {
@@ -136,7 +136,7 @@ drange_new_from_list(GSList *list)
 	return new_drange;
 }
 
-  
+
 static void
 drange_node_free_wrapper(gpointer data, gpointer userdata _U_)
 {
@@ -163,7 +163,7 @@ gboolean drange_has_total_length(drange* dr){ return dr->has_total_length; }
 gint drange_get_total_length(drange* dr) { return dr->total_length; }
 gint drange_get_min_start_offset(drange* dr) { return dr->min_start_offset; }
 gint drange_get_max_start_offset(drange* dr) { return dr->max_start_offset; }
-    
+
 static void
 update_drange_with_node(drange *dr, drange_node *drnode)
 {
@@ -188,7 +188,7 @@ drange_prepend_drange_node(drange* dr, drange_node* drnode)
   if(drnode != NULL){
     dr->range_list = g_slist_prepend(dr->range_list,drnode);
     update_drange_with_node(dr, drnode);
-  }  
+  }
 }
 
 void
@@ -197,7 +197,7 @@ drange_append_drange_node(drange* dr, drange_node* drnode)
   if(drnode != NULL){
     dr->range_list = g_slist_append(dr->range_list,drnode);
     update_drange_with_node(dr, drnode);
-  }  
+  }
 }
 
 void
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index 65ed2042de..5d897e96f6 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -1,8 +1,8 @@
 /* drange.h
  * Routines for providing general range support to the dfilter library
  *
- * $Id: drange.h,v 1.2 2001/03/02 17:04:23 gram Exp $
- * 
+ * $Id: drange.h,v 1.3 2002/08/28 20:40:55 jmayer Exp $
+ *
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
  * Ethereal - Network traffic analyzer
@@ -23,16 +23,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __DRANGE_H__ 
+#ifndef __DRANGE_H__
 #define __DRANGE_H__
 
 #include <glib.h>
 
-/* Please don't directly manipulate these structs.  Please use 
- * the methods provided.  If you REALLY can't do what you need to 
- * do with the methods provided please write new methods that do 
- * what you need, put them into the drange object here, and limit 
- * your direct manipulation of the drange and drange_node structs to 
+/* Please don't directly manipulate these structs.  Please use
+ * the methods provided.  If you REALLY can't do what you need to
+ * do with the methods provided please write new methods that do
+ * what you need, put them into the drange object here, and limit
+ * your direct manipulation of the drange and drange_node structs to
  * here.
  */
 
@@ -67,7 +67,7 @@ void drange_node_free(drange_node* drnode);
 /* Call drange_node destructor on all list items */
 void drange_node_free_list(GSList* list);
 
-/* drange_node accessors */  
+/* drange_node accessors */
 gint drange_node_get_start_offset(drange_node* drnode);
 gint drange_node_get_length(drange_node* drnode);
 gint drange_node_get_end_offset(drange_node* drnode);
@@ -83,7 +83,7 @@ void drange_node_set_to_the_end(drange_node* drnode);
 drange* drange_new();
 drange* drange_new_from_list(GSList *list);
 
-/* drange destructor, only use this if you used drange_new() to creat 
+/* drange destructor, only use this if you used drange_new() to creat
  * the drange
  */
 void drange_free(drange* dr);
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index ad61cd25db..b872c479cb 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,20 +1,20 @@
 /*
- * $Id: gencode.c,v 1.6 2002/03/02 20:48:11 guy Exp $
+ * $Id: gencode.c,v 1.7 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -331,7 +331,7 @@ typedef struct {
     int i;
     int *fields;
 } hash_key_iterator;
- 
+
 static void
 get_hash_key(gpointer key, gpointer value _U_, gpointer user_data)
 {
@@ -356,7 +356,7 @@ dfw_interesting_fields(dfwork_t *dfw, int *caller_num_fields)
 
     hki.fields = g_new(int, num_fields);
     hki.i = 0;
-        
+
     g_hash_table_foreach(dfw->interesting_fields, get_hash_key, &hki);
     *caller_num_fields = num_fields;
     return hki.fields;
diff --git a/epan/dfilter/glib-util.c b/epan/dfilter/glib-util.c
index 9e63fab4f3..880e91eb29 100644
--- a/epan/dfilter/glib-util.c
+++ b/epan/dfilter/glib-util.c
@@ -1,4 +1,4 @@
-/* $Id: glib-util.c,v 1.1 2001/02/01 20:21:18 gram Exp $ */
+/* $Id: glib-util.c,v 1.2 2002/08/28 20:40:55 jmayer Exp $ */
 
 #include <string.h>
 #include <glib.h>
@@ -44,4 +44,4 @@ g_substrdup(const char *s, int start, int len)
 	newstring[abs_len] = 0;
 
 	return newstring;
-}	
+}
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 871ca2fff8..30f36b1b7d 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,20 +1,20 @@
 /*
- * $Id: semcheck.c,v 1.12 2002/08/24 19:45:26 guy Exp $
+ * $Id: semcheck.c,v 1.13 2002/08/28 20:40:55 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -86,7 +86,7 @@ compatible_ftypes(ftenum_t a, ftenum_t b)
 				default:
 					return FALSE;
 			}
-			
+
 		case FT_STRING:
 		case FT_STRINGZ:
 		case FT_UINT_STRING:
@@ -161,7 +161,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s)
 		case FT_INT24:
 		case FT_INT32:
 			break;
-			
+
 		case FT_NUM_TYPES:
 			g_assert_not_reached();
 	}
@@ -243,7 +243,7 @@ is_bytes_type(enum ftenum type)
 		case FT_INT32:
 		case FT_INT64:
 			return FALSE;
-			
+
 		case FT_NUM_TYPES:
 			g_assert_not_reached();
 	}
@@ -348,7 +348,7 @@ check_relation_LHS_STRING(FtypeCanFunc can_func _U_, stnode_t *st_node,
 
 	type1 = stnode_type_id(st_arg1);
 	type2 = stnode_type_id(st_arg2);
-		
+
 	if (type2 == STTYPE_FIELD) {
 		hfinfo2 = stnode_data(st_arg2);
 		ftype2 = hfinfo2->type;
diff --git a/epan/dfilter/semcheck.h b/epan/dfilter/semcheck.h
index 29a7e9eecf..ddd44a89b4 100644
--- a/epan/dfilter/semcheck.h
+++ b/epan/dfilter/semcheck.h
@@ -1,21 +1,21 @@
 /*
- * $Id: semcheck.h,v 1.2 2001/02/01 20:31:18 gram Exp $
+ * $Id: semcheck.h,v 1.3 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index 68ac0db987..f046b65cfd 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.c
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-integer.c,v 1.1 2001/02/27 19:23:28 gram Exp $
+ * $Id: sttype-integer.c,v 1.2 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index 339ad47941..aaaa0dd9d4 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.c
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-pointer.c,v 1.2 2001/02/01 20:31:18 gram Exp $
+ * $Id: sttype-pointer.c,v 1.3 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index 79c4094f22..a87c3e99b7 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,20 +1,20 @@
 /*
- * $Id: sttype-range.c,v 1.4 2002/01/21 07:37:37 guy Exp $
+ * $Id: sttype-range.c,v 1.5 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-range.h b/epan/dfilter/sttype-range.h
index b5d91f1cac..3b11fd6543 100644
--- a/epan/dfilter/sttype-range.h
+++ b/epan/dfilter/sttype-range.h
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-range.h,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: sttype-range.h,v 1.4 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-string.c b/epan/dfilter/sttype-string.c
index 106622e7fc..4bd8cbc0b1 100644
--- a/epan/dfilter/sttype-string.c
+++ b/epan/dfilter/sttype-string.c
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-string.c,v 1.2 2001/02/01 20:31:18 gram Exp $
+ * $Id: sttype-string.c,v 1.3 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 24b1f85a58..d559bff19e 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-test.c,v 1.2 2001/02/01 20:31:18 gram Exp $
+ * $Id: sttype-test.c,v 1.3 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/sttype-test.h b/epan/dfilter/sttype-test.h
index cad9378d3a..a4d017f154 100644
--- a/epan/dfilter/sttype-test.h
+++ b/epan/dfilter/sttype-test.h
@@ -1,21 +1,21 @@
 /*
- * $Id: sttype-test.h,v 1.2 2001/02/01 20:31:18 gram Exp $
+ * $Id: sttype-test.h,v 1.3 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 77136dcdce..d0dc678ba7 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -1,21 +1,21 @@
 /*
- * $Id: syntax-tree.c,v 1.4 2001/10/26 17:29:11 gram Exp $
+ * $Id: syntax-tree.c,v 1.5 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index d496d25e84..88c273b38d 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -1,21 +1,21 @@
 /*
- * $Id: syntax-tree.h,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: syntax-tree.h,v 1.4 2002/08/28 20:40:56 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -114,7 +114,7 @@ stnode_value(stnode_t *node);
 	assert_magic(value, magicnum); \
 	return value->attr; \
 }
-	
+
 #define STTYPE_ACCESSOR_PROTOTYPE(ret,type,attr) \
 	ret \
 	CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node);
diff --git a/epan/epan.h b/epan/epan.h
index 3a3197f540..5e6a23788b 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -1,21 +1,21 @@
 /* epan.h
  *
- * $Id: epan.h,v 1.12 2001/12/18 19:09:03 gram Exp $
+ * $Id: epan.h,v 1.13 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
  * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 424ea60484..09c809ce66 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -1,21 +1,21 @@
 /* epan_dissect.h
  *
- * $Id: epan_dissect.h,v 1.1 2001/12/18 19:09:03 gram Exp $
+ * $Id: epan_dissect.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
  * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/except.c b/epan/except.c
index 9f75b79844..9f4bd69cf0 100644
--- a/epan/except.c
+++ b/epan/except.c
@@ -13,7 +13,7 @@
  * This source code may be translated into executable form and incorporated
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
- * $Id: except.c,v 1.2 2001/07/27 16:20:39 gram Exp $
+ * $Id: except.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  * $Name:  $
  */
 
@@ -27,7 +27,7 @@
 #define XCEPT_BUFFER_SIZE	1024
 
 #ifdef KAZLIB_RCSID
-static const char rcsid[] = "$Id: except.c,v 1.2 2001/07/27 16:20:39 gram Exp $";
+static const char rcsid[] = "$Id: except.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $";
 #endif
 
 #define group except_group
@@ -96,7 +96,7 @@ int except_init(void)
 	int uh_ok = (pthread_key_create(&uh_key, 0) == 0);
 	int alloc_ok = (pthread_key_create(&alloc_key, 0) == 0);
 	int dealloc_ok = (pthread_key_create(&dealloc_key, 0) == 0);
-       
+
 	if (!top_ok || !uh_ok || !alloc_ok || !dealloc_ok) {
 	    retval = 0;
 	    init_counter = 0;
@@ -187,7 +187,7 @@ static void do_throw(except_t *except)
 	    struct except_catch *catcher = top->info.catcher;
 	    const except_id_t *pi = catcher->id;
 	    size_t i;
-	
+
 	    assert (top->type == XCEPT_CATCHER);
 	    except_free(catcher->obj.dyndata);
 
diff --git a/epan/except.h b/epan/except.h
index 74f507be7d..3687252730 100644
--- a/epan/except.h
+++ b/epan/except.h
@@ -14,7 +14,7 @@
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
  *
- * $Id: except.h,v 1.3 2002/08/14 19:18:15 guy Exp $
+ * $Id: except.h,v 1.4 2002/08/28 20:40:44 jmayer Exp $
  * $Name:  $
  */
 
@@ -66,7 +66,7 @@ struct except_stacknode {
     struct except_stacknode *except_down;
     enum except_stacktype except_type;
     union {
-	struct except_catch *except_catcher;	
+	struct except_catch *except_catcher;
 	struct except_cleanup *except_cleanup;
     } except_info;
 };
@@ -105,7 +105,7 @@ extern void except_free(void *);
 #endif
 
 /*
- * void except_cleanup_push(void (*)(void *), void *); 
+ * void except_cleanup_push(void (*)(void *), void *);
  * void except_cleanup_pop(int);
  * void except_checked_cleanup_pop(void (*)(void *), int);
  * void except_try_push(const except_id_t [], size_t, except_t **);
@@ -130,7 +130,7 @@ extern void except_free(void *);
 	if (E)							\
 	    except_cl.except_func(except_cl.except_context);	\
     }
-	
+
 #define except_try_push(ID, NUM, PPE)				\
      {								\
 	struct except_stacknode except_sn;			\
@@ -144,6 +144,6 @@ extern void except_free(void *);
 #define except_try_pop()					\
 	except_free(except_ch.except_obj.except_dyndata);	\
 	except_pop();						\
-    } 
+    }
 
 #endif
diff --git a/epan/filesystem.c b/epan/filesystem.c
index e46a488d85..90ff0df7bc 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -1,22 +1,22 @@
 /* filesystem.c
  * Filesystem utility routines
  *
- * $Id: filesystem.c,v 1.19 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: filesystem.c,v 1.20 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/filesystem.h b/epan/filesystem.h
index 44f51748dc..ea356b8a56 100644
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -1,22 +1,22 @@
 /* filesystem.h
  * Filesystem utility definitions
  *
- * $Id: filesystem.h,v 1.11 2002/06/23 21:33:09 guy Exp $
+ * $Id: filesystem.h,v 1.12 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 8399b78835..e4be1a8385 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -1,23 +1,23 @@
 /* frame_data.c
  * Routines for packet disassembly
  *
- * $Id: frame_data.c,v 1.2 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: frame_data.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -41,8 +41,8 @@ typedef struct _frame_proto_data {
 
 static GMemChunk *frame_proto_data_area = NULL;
 
-/* 
- * Free up any space allocated for frame proto data areas and then 
+/*
+ * Free up any space allocated for frame proto data areas and then
  * allocate a new area.
  *
  * We can free the area, as the structures it contains are pointed to by
@@ -68,7 +68,7 @@ frame_data_init(void)
   	register_init_routine(&packet_init_protocol);
 }
 
-void 
+void
 frame_data_cleanup(void)
 {
   /* this function intentionally left blank :) */
@@ -94,7 +94,7 @@ void
 p_add_proto_data(frame_data *fd, int proto, void *proto_data)
 {
   frame_proto_data *p1 = g_mem_chunk_alloc(frame_proto_data_area);
- 
+
   g_assert(p1 != NULL);
 
   p1 -> proto = proto;
diff --git a/epan/frame_data.h b/epan/frame_data.h
index 99e0745610..8fd1cdff38 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -1,22 +1,22 @@
 /* frame_data.h
  * Definitions for frame_data structures and routines
  *
- * $Id: frame_data.h,v 1.6 2002/08/14 19:18:15 guy Exp $
+ * $Id: frame_data.h,v 1.7 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index 2a71858d22..0bd220394b 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,20 +1,20 @@
-/* 
- * $Id: ftype-bytes.c,v 1.12 2002/05/10 02:44:08 gram Exp $
+/*
+ * $Id: ftype-bytes.c,v 1.13 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -96,7 +96,7 @@ is_byte_sep(guint8 c)
 {
 	return (c == '-' || c == ':' || c == '.');
 }
-	
+
 static gboolean
 val_from_string(fvalue_t *fv, char *s, LogFunc logfunc)
 {
@@ -319,7 +319,7 @@ cmp_gt(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len < b->len) {
 		return FALSE;
 	}
-	
+
 	return (memcmp(a->data, b->data, a->len) > 0);
 }
 
@@ -336,7 +336,7 @@ cmp_ge(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len < b->len) {
 		return FALSE;
 	}
-	
+
 	return (memcmp(a->data, b->data, a->len) >= 0);
 }
 
@@ -353,7 +353,7 @@ cmp_lt(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len > b->len) {
 		return FALSE;
 	}
-	
+
 	return (memcmp(a->data, b->data, a->len) < 0);
 }
 
@@ -370,7 +370,7 @@ cmp_le(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len > b->len) {
 		return FALSE;
 	}
-	
+
 	return (memcmp(a->data, b->data, a->len) <= 0);
 }
 
@@ -387,7 +387,7 @@ cmp_gt_i64(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len < b->len) {
 		return FALSE;
 	}
-	
+
 	if ((a->data[0] & 0x80) == 0) {
 		/*
 		 * "a" is positive.
@@ -430,7 +430,7 @@ cmp_ge_i64(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len < b->len) {
 		return FALSE;
 	}
-	
+
 	if ((a->data[0] & 0x80) == 0) {
 		/*
 		 * "a" is positive.
@@ -473,7 +473,7 @@ cmp_lt_i64(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len > b->len) {
 		return FALSE;
 	}
-	
+
 	if (a->data[0] & 0x80) {
 		/*
 		 * "a" is negative.
@@ -516,7 +516,7 @@ cmp_le_i64(fvalue_t *fv_a, fvalue_t *fv_b)
 	if (a->len > b->len) {
 		return FALSE;
 	}
-	
+
 	if (a->data[0] & 0x80) {
 		/*
 		 * "a" is negative.
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index ca6246e4fd..b798365dd3 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-double.c,v 1.6 2002/08/24 19:45:28 guy Exp $
+ * $Id: ftype-double.c,v 1.7 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index d1521940b0..3db2ed7105 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-integer.c,v 1.9 2002/07/17 00:42:54 guy Exp $
+ * $Id: ftype-integer.c,v 1.10 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 67636f71f8..dacf82a68e 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-ipv4.c,v 1.8 2002/02/05 22:50:17 guy Exp $
+ * $Id: ftype-ipv4.c,v 1.9 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index 09884aeb4a..c3101bb177 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -1,21 +1,21 @@
 /*
- * $Id: ftype-none.c,v 1.3 2001/07/13 00:55:56 guy Exp $
+ * $Id: ftype-none.c,v 1.4 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 9c8f33ac29..3a50134dfb 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-string.c,v 1.6 2002/03/02 20:48:13 guy Exp $
+ * $Id: ftype-string.c,v 1.7 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 3013eb7ff3..77d8f6f1c6 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-time.c,v 1.16 2002/02/05 22:50:17 guy Exp $
+ * $Id: ftype-time.c,v 1.17 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 1fd9abad2a..f899bfc62a 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftype-tvbuff.c,v 1.6 2002/01/21 07:37:39 guy Exp $
+ * $Id: ftype-tvbuff.c,v 1.7 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index f67297c5f2..0796782b6e 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,20 +1,20 @@
 /*
- * $Id: ftypes-int.h,v 1.5 2002/01/21 07:37:39 guy Exp $
+ * $Id: ftypes-int.h,v 1.6 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index b4b502b5fc..d681fe037d 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -1,20 +1,20 @@
 /*
- * $Id: ftypes.c,v 1.6 2002/02/05 22:50:17 guy Exp $
+ * $Id: ftypes.c,v 1.7 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 0596b8c952..3aa731d1ac 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -1,22 +1,22 @@
 /* ftypes.h
  * Definitions for field types
  *
- * $Id: ftypes.h,v 1.13 2002/08/24 19:45:28 guy Exp $
+ * $Id: ftypes.h,v 1.14 2002/08/28 20:41:00 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/gdebug.h b/epan/gdebug.h
index baa2cc548d..676b931411 100644
--- a/epan/gdebug.h
+++ b/epan/gdebug.h
@@ -2,23 +2,23 @@
  *
  * Useful macro for use during development.
  *
- * $Id: gdebug.h,v 1.2 2001/02/01 20:31:17 gram Exp $
+ * $Id: gdebug.h,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2001 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/inet_aton.c b/epan/inet_aton.c
index f101d10cd1..880d669117 100644
--- a/epan/inet_aton.c
+++ b/epan/inet_aton.c
@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
 
 #include "inet_aton.h"
 
-/* 
+/*
  * Check whether "cp" is a valid ascii representation
  * of an Internet address and convert to a binary address.
  * Returns 1 if the address is valid, 0 if not.
@@ -98,7 +98,7 @@ inet_aton(cp_arg, addr)
 				continue;
 			}
 			if (base == 16 && isascii(c) && isxdigit(c)) {
-				val = (val << 4) + 
+				val = (val << 4) +
 					(c + 10 - (islower(c) ? 'a' : 'A'));
 				cp++;
 				continue;
diff --git a/epan/inet_aton.h b/epan/inet_aton.h
index 40fa26c1af..41a8826625 100644
--- a/epan/inet_aton.h
+++ b/epan/inet_aton.h
@@ -1,6 +1,6 @@
 /* inet_aton.h
  *
- * $Id: inet_aton.h,v 1.1 2000/10/14 04:31:26 gram Exp $
+ * $Id: inet_aton.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -10,12 +10,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/inet_ntop.c b/epan/inet_ntop.c
index 4b69b19b9b..6322121acb 100644
--- a/epan/inet_ntop.c
+++ b/epan/inet_ntop.c
@@ -20,7 +20,7 @@
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.5 2002/08/04 00:45:59 jmayer Exp $";
+static char rcsid[] = "$Id: inet_ntop.c,v 1.6 2002/08/28 20:40:44 jmayer Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef HAVE_SYS_PARAM_H
@@ -220,7 +220,7 @@ inet_ntop6(src, dst, size)
 		tp += sprintf(tp, "%x", words[i]);
 	}
 	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
+	if (best.base != -1 && (best.base + best.len) ==
 	    (NS_IN6ADDRSZ / NS_INT16SZ))
 		*tp++ = ':';
 	*tp++ = '\0';
diff --git a/epan/inet_v6defs.h b/epan/inet_v6defs.h
index d3bdb962e6..b63d240bed 100644
--- a/epan/inet_v6defs.h
+++ b/epan/inet_v6defs.h
@@ -1,6 +1,6 @@
 /* inet_v6defs.h
  *
- * $Id: inet_v6defs.h,v 1.1 2000/10/14 04:31:26 gram Exp $
+ * $Id: inet_v6defs.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -10,12 +10,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/int-64bit.c b/epan/int-64bit.c
index d54660a41d..70d14858fe 100644
--- a/epan/int-64bit.c
+++ b/epan/int-64bit.c
@@ -2,22 +2,22 @@
  * Routines for handling of 64-bit integers
  * 2001 Ronnie Sahlberg
  *
- * $Id: int-64bit.c,v 1.2 2002/03/02 20:48:10 guy Exp $
+ * $Id: int-64bit.c,v 1.3 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -30,11 +30,11 @@
 #include <string.h>
 #include "int-64bit.h"
 
-/* all functions take the 64bit integer parameter as a 
+/* all functions take the 64bit integer parameter as a
    pointer to a 64bit integer in network order.
    that is ptr[0] is the most significant byte and
    ptr[7] is the least significant byte.
-*/   
+*/
 
 #define U64STRLEN	21
 
@@ -112,11 +112,11 @@ static const signed char u64val[64][U64STRLEN] =
 
 
 /* convert an unsigned  64 bit integer into a string
-   it is important that this function is efficient 
+   it is important that this function is efficient
    since it will be used for every 64bit integer in
    any capture.
    It is much less important that the inverse: atou64
-   be efficient since it is only called when  
+   be efficient since it is only called when
    diplayfilters are entered.
 
    "neg" should be 1 if the number should have a "-" put in
@@ -154,7 +154,7 @@ n64toa(const unsigned char *u64ptr, int neg)
 		   since othevise the signed char in acc will
 		   owerflow/wrap, but we dont need to do it
 		   for every iteration. its enough if we
-		   do it halfway through and at the end 
+		   do it halfway through and at the end
 		   and we will prevent any overflow.
 		*/
 		if((i%4)==0){
@@ -162,7 +162,7 @@ n64toa(const unsigned char *u64ptr, int neg)
 			for(j=0;j<U64STRLEN-1;j++){
 				if(acc[j]>9){
 					int x;
-					x=acc[j]/10; 
+					x=acc[j]/10;
 					acc[j+1]+=x;
 					acc[j]-=x*10;
 				}
@@ -312,7 +312,7 @@ atou64(const char *u64str, unsigned char *u64int)
 
 	/* clear the residual string and copy the
 	   original to it (subtracting '0')
-	*/ 
+	*/
 	for(i=0;i<U64STRLEN;i++){
 		res[i]=0;
 	}
@@ -324,7 +324,7 @@ atou64(const char *u64str, unsigned char *u64int)
 		res[i]=u64str[len]-'0';
 	}
 
-	/* go through all bits and subtract their 
+	/* go through all bits and subtract their
 	   value */
 	for(i=63;i>=0;i--){
 		if(revcmp(u64val[i], res, U64STRLEN)<=0){
@@ -425,7 +425,7 @@ ntoh(unsigned char h)
 	if((h>='A')&&(h<='F')){
 		return h+10-'A';
 	}
- 
+
 	if((h>='a')&&(h<='f')){
 		return h+10-'a';
 	}
@@ -490,7 +490,7 @@ htou64(const char *u64str, unsigned char *u64int)
 	for(i=0;i<len;i++){
 		str[15-i]=u64str[len+1-i];
 	}
-	
+
 
 	for(i=0;i<8;i++){
 		u64int[i]=(ntoh(str[i*2])<<4)
diff --git a/epan/int-64bit.h b/epan/int-64bit.h
index c32418e903..40f65fb6f0 100644
--- a/epan/int-64bit.h
+++ b/epan/int-64bit.h
@@ -1,18 +1,18 @@
 /* int-64bit.h
- * Handling of 64-bit integers 
+ * Handling of 64-bit integers
  *
- * $Id: int-64bit.h,v 1.1 2001/11/22 03:07:06 hagbard Exp $
+ * $Id: int-64bit.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ipv4.c b/epan/ipv4.c
index afb3b4e87d..f37caef07d 100644
--- a/epan/ipv4.c
+++ b/epan/ipv4.c
@@ -5,23 +5,23 @@
  *
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: ipv4.c,v 1.3 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: ipv4.c,v 1.4 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ipv4.h b/epan/ipv4.h
index 5115eb517a..40648c3207 100644
--- a/epan/ipv4.h
+++ b/epan/ipv4.h
@@ -5,23 +5,23 @@
  *
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: ipv4.h,v 1.3 2001/11/13 23:55:37 gram Exp $
+ * $Id: ipv4.h,v 1.4 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/ipv6-utils.h b/epan/ipv6-utils.h
index e894dac1ac..0cdeff9e1b 100644
--- a/epan/ipv6-utils.h
+++ b/epan/ipv6-utils.h
@@ -1,7 +1,7 @@
 /* ipv6-utils.h
- * Definitions for IPv6 packet disassembly 
+ * Definitions for IPv6 packet disassembly
  *
- * $Id: ipv6-utils.h,v 1.1 2001/04/01 07:06:23 hagbard Exp $
+ * $Id: ipv6-utils.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -9,17 +9,17 @@
  * Copyright 1998 Gerald Combs
  *
  * MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr>
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/nstime.h b/epan/nstime.h
index 5c6eb1a720..2cadd521d1 100644
--- a/epan/nstime.h
+++ b/epan/nstime.h
@@ -1,22 +1,22 @@
 /* nstime.h
  * Definition of data structure to hold time values with nanosecond resolution
  *
- * $Id: nstime.h,v 1.1 2001/09/14 07:33:04 guy Exp $
+ * $Id: nstime.h,v 1.2 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index f1ac5dc276..b61b2dd176 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -2,7 +2,7 @@
  * Routines for ISO/OSI network and transport protocol packet disassembly
  * Main entrance point and common functions
  *
- * $Id: osi-utils.c,v 1.7 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: osi-utils.c,v 1.8 2002/08/28 20:40:44 jmayer Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
@@ -10,17 +10,17 @@
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -51,9 +51,9 @@ gchar *print_nsap_net( const guint8 *buffer, int length)
   }
   if ( ( length == RFC1237_NSAP_LEN ) || ( length == RFC1237_NSAP_LEN + 1 ) ) {
     cur += sprintf( cur, "%s", print_area( buffer, RFC1237_FULLAREA_LEN ) );
-    cur += sprintf( cur, "%s", print_system_id( buffer + RFC1237_FULLAREA_LEN, 
+    cur += sprintf( cur, "%s", print_system_id( buffer + RFC1237_FULLAREA_LEN,
                     RFC1237_SYSTEMID_LEN ) );
-    cur += sprintf( cur, "[%02x]", 
+    cur += sprintf( cur, "[%02x]",
                     buffer[ RFC1237_FULLAREA_LEN + RFC1237_SYSTEMID_LEN ] );
     if ( length == RFC1237_NSAP_LEN + 1 ) {
       cur += sprintf( cur, "-%02x", buffer[ length -1 ] );
@@ -68,14 +68,14 @@ gchar *print_nsap_net( const guint8 *buffer, int length)
 
 gchar *print_system_id( const guint8 *buffer, int length ) {
   int           tmp;
-  gchar        *cur; 
-  static gchar  str[MAX_SYSTEMID_LEN * 3 + 5]; /* Don't trust exact matching */  
- 
+  gchar        *cur;
+  static gchar  str[MAX_SYSTEMID_LEN * 3 + 5]; /* Don't trust exact matching */
+
   if ( ( length <= 0 ) || ( length > MAX_SYSTEMID_LEN ) ) {
     sprintf( str, "<Invalid length of SYSTEM ID>");
     return( str );
-  }  
- 
+  }
+
   cur = str;
   if ( ( 6 == length ) || ( 7 == length ) ) { /* Special case, print as MAC */
     cur += sprintf(cur, "%02x%02x.%02x%02x.%02x%02x", buffer[0], buffer[1],
@@ -109,7 +109,7 @@ gchar *print_area(const guint8 *buffer, int length)
   /* to do : all real area decoding now: NET is assumed if id len is 1 more byte
    * and take away all these stupid resource consuming local statics
    */
-  
+
   static gchar  str[MAX_AREA_LEN * 3 + 20]; /* reserve space for nice layout */
   gchar *cur;
   int  tmp  = 0;
@@ -120,23 +120,23 @@ gchar *print_area(const guint8 *buffer, int length)
     sprintf( str, "<Invalid length of AREA>");
     return( str );
   }
-  
-  if ( (  ( NSAP_IDI_ISODCC          == *buffer )      
+
+  if ( (  ( NSAP_IDI_ISODCC          == *buffer )
        || ( NSAP_IDI_GOSIP2          == *buffer )
        )
-       && 
-       (  ( RFC1237_FULLAREA_LEN     ==  length ) 
+       &&
+       (  ( RFC1237_FULLAREA_LEN     ==  length )
        || ( RFC1237_FULLAREA_LEN + 1 ==  length )
-       ) 
+       )
      ) {    /* AFI is good and length is long enough  */
-  
+
     if ( length > RFC1237_FULLAREA_LEN + 1 ) {  /* Special Case Designated IS */
       sprintf( str, "<Invalid length of AREA for DCC / GOSIP AFI>");
       return( str );
     }
- 
-    cur += sprintf( cur, "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]", 
-                    buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], 
+
+    cur += sprintf( cur, "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]",
+                    buffer[0], buffer[1], buffer[2], buffer[3], buffer[4],
                     buffer[5], buffer[6], buffer[7], buffer[8] );
     cur += sprintf( cur, "[%02x:%02x|%02x:%02x]",
                     buffer[9], buffer[10],  buffer[11], buffer[12] );
@@ -151,7 +151,7 @@ gchar *print_area(const guint8 *buffer, int length)
 			buffer[2] );
 			return( str );
        }
-    if ( 4 < length ) { 
+    if ( 4 < length ) {
       while ( tmp < length / 4 ) {      /* 16/4==4 > four Octets left to print */
         cur += sprintf( cur, "%02x", buffer[tmp++] );
         cur += sprintf( cur, "%02x", buffer[tmp++] );
@@ -162,10 +162,10 @@ gchar *print_area(const guint8 *buffer, int length)
         sprintf( --cur, "-%02x", buffer[tmp] );
       }
       else {
-        for ( ; tmp < length; ) {  /* print the rest without dot */ 
+        for ( ; tmp < length; ) {  /* print the rest without dot */
           cur += sprintf( cur, "%02x", buffer[tmp++] );
         }
-      } 
+      }
     }
     return( str );
   }
diff --git a/epan/osi-utils.h b/epan/osi-utils.h
index ae3d5a0b90..9480c2a43b 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.h
@@ -1,22 +1,22 @@
 /* osi-utils.h
  *
- * $Id: osi-utils.h,v 1.3 2001/04/02 10:41:19 guy Exp $
+ * $Id: osi-utils.h,v 1.4 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -27,9 +27,9 @@
 
 /* OSI Global defines, common for all OSI protocols */
 
-#define MAX_NSAP_LEN          30    
-#define MAX_SYSTEMID_LEN      15    
-#define MAX_AREA_LEN          30    
+#define MAX_NSAP_LEN          30
+#define MAX_SYSTEMID_LEN      15
+#define MAX_AREA_LEN          30
 
 #define RFC1237_NSAP_LEN      20
 #define RFC1237_FULLAREA_LEN  13
diff --git a/epan/packet.c b/epan/packet.c
index f9ebb652de..7703db1c62 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,22 +1,22 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.77 2002/08/24 10:41:40 guy Exp $
+ * $Id: packet.c,v 1.78 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -63,7 +63,7 @@ static gint proto_malformed = -1;
 static dissector_handle_t frame_handle = NULL;
 static dissector_handle_t data_handle = NULL;
 
-const true_false_string flags_set_truth = { 
+const true_false_string flags_set_truth = {
   "Set",
   "Not set"
 };
@@ -589,7 +589,7 @@ dissector_try_port(dissector_table_t sub_dissectors, guint32 port,
 		 * we return TRUE.
 		 */
 		return ret != 0;
-	} 
+	}
 	return FALSE;
 }
 
@@ -1035,7 +1035,7 @@ register_dissector(const char *name, dissector_t dissector, int proto)
 	handle->is_new = FALSE;
 	handle->dissector.old = dissector;
 	handle->proto_index = proto;
-	
+
 	g_hash_table_insert(registered_dissectors, (gpointer)name,
 	    (gpointer) handle);
 }
@@ -1059,7 +1059,7 @@ new_register_dissector(const char *name, new_dissector_t dissector, int proto)
 	handle->is_new = TRUE;
 	handle->dissector.new = dissector;
 	handle->proto_index = proto;
-	
+
 	g_hash_table_insert(registered_dissectors, (gpointer)name,
 	    (gpointer) handle);
 }
diff --git a/epan/packet.h b/epan/packet.h
index e53efd263b..9cd617520c 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,22 +1,22 @@
 /* packet.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet.h,v 1.59 2002/08/21 21:25:21 tpot Exp $
+ * $Id: packet.h,v 1.60 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/packet_info.h b/epan/packet_info.h
index c78e26e7f7..4f6d813a72 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -1,22 +1,22 @@
 /* packet_info.h
  * Definitions for packet info structures and routines
  *
- * $Id: packet_info.h,v 1.18 2002/08/22 18:53:54 guy Exp $
+ * $Id: packet_info.h,v 1.19 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/pint.h b/epan/pint.h
index e73df6d310..2138d85a56 100644
--- a/epan/pint.h
+++ b/epan/pint.h
@@ -2,23 +2,23 @@
  * Definitions for extracting and translating integers safely and portably
  * via pointers.
  *
- * $Id: pint.h,v 1.5 2002/08/02 21:29:39 jmayer Exp $
+ * $Id: pint.h,v 1.6 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -62,7 +62,7 @@
                      (guint32)*((guint8 *)(p)+0)<<0)
 
 
-	
+
 /* Macros to byte-swap 32-bit and 16-bit quantities. */
 #define	BSWAP32(x) \
 	((((x)&0xFF000000)>>24) | \
diff --git a/epan/plugins.c b/epan/plugins.c
index 751004e437..73d338cfe7 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -1,22 +1,22 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.58 2002/08/14 19:18:15 guy Exp $
+ * $Id: plugins.c,v 1.59 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1999 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -46,7 +46,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h> 
+#include <errno.h>
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/epan/plugins.h b/epan/plugins.h
index a780acd3ea..1a3695153a 100644
--- a/epan/plugins.h
+++ b/epan/plugins.h
@@ -1,23 +1,23 @@
 /* plugins.h
  * definitions for plugins structures
  *
- * $Id: plugins.h,v 1.8 2001/03/31 22:36:21 hagbard Exp $
+ * $Id: plugins.h,v 1.9 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1999 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/proto.c b/epan/proto.c
index d173cad23f..fb55c190ad 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,22 +1,22 @@
 /* proto.c
  * Routines for protocol tree
  *
- * $Id: proto.c,v 1.73 2002/08/24 19:45:24 guy Exp $
+ * $Id: proto.c,v 1.74 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -483,7 +483,7 @@ proto_tree_add_text(proto_tree *tree, tvbuff_t *tvb, gint start, gint length,
 
 /* Add a text-only node to the proto_tree (va_list version) */
 proto_item *
-proto_tree_add_text_valist(proto_tree *tree, tvbuff_t *tvb, gint start, 
+proto_tree_add_text_valist(proto_tree *tree, tvbuff_t *tvb, gint start,
 	gint length, const char *format, va_list ap)
 {
 	proto_item	*pi;
@@ -802,7 +802,7 @@ proto_tree_add_none_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint st
 	return pi;
 }
 
-	
+
 static void
 proto_tree_set_protocol_tvb(field_info *fi, tvbuff_t *tvb)
 {
@@ -1930,7 +1930,7 @@ void
 proto_item_set_len(proto_item *pi, gint length)
 {
 	field_info *fi;
-	
+
 	if (pi == NULL)
 		return;
 	fi = PITEM_FINFO(pi);
@@ -1967,7 +1967,7 @@ proto_tree_create_root(void)
 	return (proto_tree*) g_node_new(pnode);
 }
 
-	
+
 /* "prime" a proto_tree with a single hfid that a dfilter
  * is interested in. */
 void
@@ -2084,14 +2084,14 @@ static protocol_t *
 find_protocol_by_id(int proto_id)
 {
 	GList *list_entry;
-	
+
 	list_entry = g_list_find_custom(protocols, &proto_id, compare_proto_id);
 	if (list_entry == NULL)
 		return NULL;
 	return list_entry->data;
 }
 
-static gint compare_filter_name(gconstpointer proto_arg, 
+static gint compare_filter_name(gconstpointer proto_arg,
 				gconstpointer filter_name)
 {
 	const protocol_t *protocol = proto_arg;
@@ -2106,7 +2106,7 @@ int proto_get_id_by_filter_name(gchar* filter_name)
 	protocol_t *protocol;
 
 	list_entry = g_list_find_custom(protocols, filter_name,
-	    compare_filter_name); 
+	    compare_filter_name);
 	if (list_entry == NULL)
 		return -1;
 	protocol = list_entry->data;
@@ -2160,7 +2160,7 @@ proto_can_disable_protocol(int proto_id)
 	return protocol->can_disable;
 }
 
-void 
+void
 proto_set_decoding(int proto_id, gboolean enabled)
 {
 	protocol_t *protocol;
@@ -2170,7 +2170,7 @@ proto_set_decoding(int proto_id, gboolean enabled)
 	protocol->is_enabled = enabled;
 }
 
-void 
+void
 proto_set_cant_disable(int proto_id)
 {
 	protocol_t *protocol;
@@ -2304,7 +2304,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
 			bytes = fvalue_get(fi->value);
 			if (bytes) {
 				snprintf(label_str, ITEM_LABEL_LENGTH,
-					"%s: %s", hfinfo->name, 
+					"%s: %s", hfinfo->name,
 					 bytes_to_str(bytes, fvalue_length(fi->value)));
 			}
 			else {
@@ -2415,7 +2415,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
 				get_hostname6((struct e_in6_addr *)bytes),
 				ip6_to_str((struct e_in6_addr*)bytes));
 			break;
-	
+
 		case FT_STRING:
 		case FT_STRINGZ:
 		case FT_UINT_STRING:
@@ -3456,7 +3456,7 @@ proto_alloc_dfilter_string(field_info *finfo, guint8 *pd)
 				 /* XXX - bytes_to_str_punct() will truncate long strings with '...' */
 				 bytes_to_str_punct(fvalue_get(finfo->value),
 					 fvalue_length(finfo->value),':'));
-			break;       
+			break;
 
 		default:
 			c = pd + finfo->start;
diff --git a/epan/proto.h b/epan/proto.h
index 64973ad99e..e41dacb651 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,22 +1,22 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.35 2002/08/24 19:45:24 guy Exp $
+ * $Id: proto.h,v 1.36 2002/08/28 20:40:44 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -122,7 +122,7 @@ typedef struct {
 /* Each GNode (proto_tree, proto_item) points to one of
  * these. */
 typedef struct {
-    field_info  *finfo;    
+    field_info  *finfo;
     tree_data_t *tree_data;
 } proto_node;
 
@@ -171,7 +171,7 @@ extern int proto_item_get_len(proto_item *ti);
 /* Creates new proto_tree root */
 extern proto_tree* proto_tree_create_root(void);
 
-/* Mark a field/protocol ID as "interesting". */    
+/* Mark a field/protocol ID as "interesting". */
 extern void
 proto_tree_prime_hfid(proto_tree *tree, int hfid);
 
diff --git a/epan/resolv.c b/epan/resolv.c
index 7c8128918d..495c23229f 100644
--- a/epan/resolv.c
+++ b/epan/resolv.c
@@ -1,24 +1,24 @@
 /* resolv.c
  * Routines for network object lookup
  *
- * $Id: resolv.c,v 1.24 2002/08/02 21:29:40 jmayer Exp $
+ * $Id: resolv.c,v 1.25 2002/08/28 20:40:45 jmayer Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -175,7 +175,7 @@ gchar *g_pipxnets_path = NULL;		/* personal ipxnets file */
 					/* first resolving call  */
 
 /*
- *  Local function definitions 
+ *  Local function definitions
  */
 
 static guchar *serv_name_lookup(guint port, port_type proto)
@@ -205,13 +205,13 @@ static guchar *serv_name_lookup(guint port, port_type proto)
     /*NOTREACHED*/
     break;
   } /* proto */
-  
+
   hash_idx = HASH_PORT(port);
   tp = table[hash_idx];
 
   if( tp == NULL ) {
     tp = table[hash_idx] = (hashname_t *)g_malloc(sizeof(hashname_t));
-  } else {  
+  } else {
     while(1) {
       if( tp->addr == port ) {
 	return tp->name;
@@ -224,12 +224,12 @@ static guchar *serv_name_lookup(guint port, port_type proto)
       tp = tp->next;
     }
   }
-  
+
   /* fill in a new entry */
   tp->addr = port;
   tp->next = NULL;
 
-  if (!(g_resolv_flags & RESOLV_TRANSPORT) || 
+  if (!(g_resolv_flags & RESOLV_TRANSPORT) ||
       (servp = getservbyport(g_htons(port), serv_proto)) == NULL) {
     /* unknown port */
     sprintf(tp->name, "%d", port);
@@ -268,7 +268,7 @@ static guchar *host_name_lookup(guint addr, gboolean *found)
 
   if( tp == NULL ) {
     tp = host_table[hash_idx] = (hashname_t *)g_malloc(sizeof(hashname_t));
-  } else {  
+  } else {
     while(1) {
       if( tp->addr == addr ) {
 	if (tp->is_dummy_entry)
@@ -283,7 +283,7 @@ static guchar *host_name_lookup(guint addr, gboolean *found)
       tp = tp->next;
     }
   }
-  
+
   /* fill in a new entry */
   tp->addr = addr;
   tp->next = NULL;
@@ -296,9 +296,9 @@ static guchar *host_name_lookup(guint addr, gboolean *found)
    */
   if (addr != 0 && (g_resolv_flags & RESOLV_NETWORK)) {
 #ifdef AVOID_DNS_TIMEOUT
-    
+
     /* Quick hack to avoid DNS/YP timeout */
-  
+
     if (!setjmp(hostname_env)) {
       signal(SIGALRM, abort_network_query);
       alarm(DNS_TIMEOUT);
@@ -336,9 +336,9 @@ static guchar *host_name_lookup6(struct e_in6_addr *addr, gboolean *found)
 
   if (g_resolv_flags & RESOLV_NETWORK) {
 #ifdef AVOID_DNS_TIMEOUT
-    
+
     /* Quick hack to avoid DNS/YP timeout */
-    
+
     if (!setjmp(hostname_env)) {
       signal(SIGALRM, abort_network_query);
       alarm(DNS_TIMEOUT);
@@ -361,7 +361,7 @@ static guchar *host_name_lookup6(struct e_in6_addr *addr, gboolean *found)
   /* unknown host or DNS timeout */
 #endif /* INET6 */
   *found = FALSE;
-  sprintf(name, "%s", ip6_to_str(addr));  
+  sprintf(name, "%s", ip6_to_str(addr));
   return (name);
 }
 
@@ -378,16 +378,16 @@ static int fgetline(char **buf, int *size, FILE *fp)
     return -1;
 
   if (*buf == NULL) {
-    if (*size == 0) 
+    if (*size == 0)
       *size = BUFSIZ;
-    
+
     if ((*buf = g_malloc(*size)) == NULL)
       return -1;
   }
 
   if (feof(fp))
     return -1;
-    
+
   len = 0;
   while ((c = getc(fp)) != EOF && c != '\n') {
     if (len+1 >= *size) {
@@ -399,9 +399,9 @@ static int fgetline(char **buf, int *size, FILE *fp)
 
   if (len == 0 && c == EOF)
     return -1;
-    
+
   (*buf)[len] = '\0';
-    
+
   return len;
 
 } /* fgetline */
@@ -411,15 +411,15 @@ static int fgetline(char **buf, int *size, FILE *fp)
  * Ethernet / manufacturer resolution
  *
  * The following functions implement ethernet address resolution and
- * ethers files parsing (see ethers(4)). 
+ * ethers files parsing (see ethers(4)).
  *
- * The manuf file has the same format as ethers(4) except that names are 
- * truncated to MAXMANUFLEN-1 characters and that an address contains 
+ * The manuf file has the same format as ethers(4) except that names are
+ * truncated to MAXMANUFLEN-1 characters and that an address contains
  * only 3 bytes (instead of 6).
  *
  * Notes:
  *
- * I decide to not use the existing functions (see ethers(3) on some 
+ * I decide to not use the existing functions (see ethers(3) on some
  * operating systems) for the following reasons:
  * - performance gains (use of hash tables and some other enhancements),
  * - use of two ethers files (system-wide and per user),
@@ -443,10 +443,10 @@ static int parse_ether_line(char *line, ether_t *eth, int six_bytes)
 
   gchar *cp;
   int a0, a1, a2, a3, a4, a5;
-    
+
   if ((cp = strchr(line, '#')))
     *cp = '\0';
-  
+
   if ((cp = strtok(line, " \t\n")) == NULL)
     return -1;
 
@@ -509,12 +509,12 @@ static void end_ethent(void)
 
 static ether_t *get_ethent(int six_bytes)
 {
- 
+
   static ether_t eth;
   static int     size = 0;
   static char   *buf = NULL;
-  
-  if (eth_p == NULL) 
+
+  if (eth_p == NULL)
     return NULL;
 
   while (fgetline(&buf, &size, eth_p) >= 0) {
@@ -522,7 +522,7 @@ static ether_t *get_ethent(int six_bytes)
       return &eth;
     }
   }
-    
+
   return NULL;
 
 } /* get_ethent */
@@ -530,7 +530,7 @@ static ether_t *get_ethent(int six_bytes)
 static ether_t *get_ethbyname(const guchar *name)
 {
   ether_t *eth;
-  
+
   set_ethent(g_ethers_path);
 
   while ((eth = get_ethent(1)) && strncmp(name, eth->name, MAXNAMELEN) != 0)
@@ -538,7 +538,7 @@ static ether_t *get_ethbyname(const guchar *name)
 
   if (eth == NULL) {
     end_ethent();
-    
+
     set_ethent(g_pethers_path);
 
     while ((eth = get_ethent(1)) && strncmp(name, eth->name, MAXNAMELEN) != 0)
@@ -555,7 +555,7 @@ static ether_t *get_ethbyaddr(const guint8 *addr)
 {
 
   ether_t *eth;
-  
+
   set_ethent(g_ethers_path);
 
   while ((eth = get_ethent(1)) && memcmp(addr, eth->addr, 6) != 0)
@@ -563,12 +563,12 @@ static ether_t *get_ethbyaddr(const guint8 *addr)
 
   if (eth == NULL) {
     end_ethent();
-    
+
     set_ethent(g_pethers_path);
-    
+
     while ((eth = get_ethent(1)) && memcmp(addr, eth->addr, 6) != 0)
       ;
-    
+
     end_ethent();
   }
 
@@ -587,7 +587,7 @@ static void add_manuf_name(guint8 *addr, guchar *name)
 
   if( tp == NULL ) {
     tp = manuf_table[hash_idx] = (hashmanuf_t *)g_malloc(sizeof(hashmanuf_t));
-  } else {  
+  } else {
     while(1) {
       if (tp->next == NULL) {
 	tp->next = (hashmanuf_t *)g_malloc(sizeof(hashmanuf_t));
@@ -597,7 +597,7 @@ static void add_manuf_name(guint8 *addr, guchar *name)
       tp = tp->next;
     }
   }
-  
+
   memcpy(tp->addr, addr, sizeof(tp->addr));
   strncpy(tp->name, name, MAXMANUFLEN);
   tp->name[MAXMANUFLEN-1] = '\0';
@@ -613,14 +613,14 @@ static hashmanuf_t *manuf_name_lookup(const guint8 *addr)
   hash_idx = HASH_ETH_MANUF(addr);
 
   tp = manuf_table[hash_idx];
-  
+
   while(tp != NULL) {
     if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
       return tp;
     }
     tp = tp->next;
   }
-  
+
   return NULL;
 
 } /* manuf_name_lookup */
@@ -651,7 +651,7 @@ static void initialize_ethers(void)
     strlen(ENAME_MANUF) + 2);
   sprintf(manuf_path, "%s" G_DIR_SEPARATOR_S "%s", get_datafile_dir(),
     ENAME_MANUF);
-  
+
   /* Read it and initialize the hash table */
   set_ethent(manuf_path);
 
@@ -676,7 +676,7 @@ static hashether_t *add_eth_name(const guint8 *addr, const guchar *name)
 
   if( tp == NULL ) {
     tp = eth_table[hash_idx] = (hashether_t *)g_malloc(sizeof(hashether_t));
-  } else {  
+  } else {
     while(1) {
       if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
 	/* address already known */
@@ -695,7 +695,7 @@ static hashether_t *add_eth_name(const guint8 *addr, const guchar *name)
       tp = tp->next;
     }
   }
-  
+
   memcpy(tp->addr, addr, sizeof(tp->addr));
   strncpy(tp->name, name, MAXNAMELEN);
   tp->name[MAXNAMELEN-1] = '\0';
@@ -719,7 +719,7 @@ static guchar *eth_name_lookup(const guint8 *addr)
 
   if( tp == NULL ) {
     tp = eth_table[hash_idx] = (hashether_t *)g_malloc(sizeof(hashether_t));
-  } else {  
+  } else {
     while(1) {
       if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
 	return tp->name;
@@ -732,7 +732,7 @@ static guchar *eth_name_lookup(const guint8 *addr)
       tp = tp->next;
     }
   }
-  
+
   /* fill in a new entry */
 
   memcpy(tp->addr, addr, sizeof(tp->addr));
@@ -744,7 +744,7 @@ static guchar *eth_name_lookup(const guint8 *addr)
     if ((manufp = manuf_name_lookup(addr)) == NULL)
       sprintf(tp->name, "%s", ether_to_str((guint8 *)addr));
     else
-      sprintf(tp->name, "%s_%02x:%02x:%02x", 
+      sprintf(tp->name, "%s_%02x:%02x:%02x",
 	      manufp->name, addr[3], addr[4], addr[5]);
 
     tp->is_dummy_entry = TRUE;
@@ -801,10 +801,10 @@ static int parse_ipxnets_line(char *line, ipxnet_t *ipxnet)
   gchar		*cp;
   guint32	a, a0, a1, a2, a3;
   gboolean	found_single_number = FALSE;
-    
+
   if ((cp = strchr(line, '#')))
     *cp = '\0';
-  
+
   if ((cp = strtok(line, " \t\n")) == NULL)
     return -1;
 
@@ -862,12 +862,12 @@ static void end_ipxnetent(void)
 
 static ipxnet_t *get_ipxnetent(void)
 {
- 
+
   static ipxnet_t ipxnet;
   static int     size = 0;
   static char   *buf = NULL;
-  
-  if (ipxnet_p == NULL) 
+
+  if (ipxnet_p == NULL)
     return NULL;
 
   while (fgetline(&buf, &size, ipxnet_p) >= 0) {
@@ -875,7 +875,7 @@ static ipxnet_t *get_ipxnetent(void)
       return &ipxnet;
     }
   }
-    
+
   return NULL;
 
 } /* get_ipxnetent */
@@ -883,7 +883,7 @@ static ipxnet_t *get_ipxnetent(void)
 static ipxnet_t *get_ipxnetbyname(const guchar *name)
 {
   ipxnet_t *ipxnet;
-  
+
   set_ipxnetent(g_ipxnets_path);
 
   while ((ipxnet = get_ipxnetent()) && strncmp(name, ipxnet->name, MAXNAMELEN) != 0)
@@ -891,7 +891,7 @@ static ipxnet_t *get_ipxnetbyname(const guchar *name)
 
   if (ipxnet == NULL) {
     end_ipxnetent();
-    
+
     set_ipxnetent(g_pipxnets_path);
 
     while ((ipxnet = get_ipxnetent()) && strncmp(name, ipxnet->name, MAXNAMELEN) != 0)
@@ -908,19 +908,19 @@ static ipxnet_t *get_ipxnetbyaddr(guint32 addr)
 {
 
   ipxnet_t *ipxnet;
-  
+
   set_ipxnetent(g_ipxnets_path);
 
   while ((ipxnet = get_ipxnetent()) && (addr != ipxnet->addr) ) ;
 
   if (ipxnet == NULL) {
     end_ipxnetent();
-    
+
     set_ipxnetent(g_pipxnets_path);
-    
+
     while ((ipxnet = get_ipxnetent()) && (addr != ipxnet->addr) )
       ;
-    
+
     end_ipxnetent();
   }
 
@@ -963,7 +963,7 @@ static hashipxnet_t *add_ipxnet_name(guint addr, const guchar *name)
 
   if( tp == NULL ) {
     tp = ipxnet_table[hash_idx] = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
-  } else {  
+  } else {
     while(1) {
       if (tp->next == NULL) {
 	tp->next = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
@@ -973,7 +973,7 @@ static hashipxnet_t *add_ipxnet_name(guint addr, const guchar *name)
       tp = tp->next;
     }
   }
-  
+
   tp->addr = addr;
   strncpy(tp->name, name, MAXNAMELEN);
   tp->name[MAXNAMELEN-1] = '\0';
@@ -995,7 +995,7 @@ static guchar *ipxnet_name_lookup(const guint addr)
 
   if( tp == NULL ) {
     tp = ipxnet_table[hash_idx] = (hashipxnet_t *)g_malloc(sizeof(hashipxnet_t));
-  } else {  
+  } else {
     while(1) {
       if (tp->addr == addr) {
 	return tp->name;
@@ -1008,7 +1008,7 @@ static guchar *ipxnet_name_lookup(const guint addr)
       tp = tp->next;
     }
   }
-  
+
   /* fill in a new entry */
 
   tp->addr = addr;
@@ -1061,11 +1061,11 @@ static guint ipxnet_addr_lookup(const guchar *name, gboolean *success)
 } /* ipxnet_addr_lookup */
 
 
-/* 
+/*
  *  External Functions
  */
 
-extern guchar *get_hostname(guint addr) 
+extern guchar *get_hostname(guint addr)
 {
   gboolean found;
 
@@ -1104,7 +1104,7 @@ extern void add_host_name(guint addr, const guchar *name)
 
   if( tp == NULL ) {
     tp = host_table[hash_idx] = (hashname_t *)g_malloc(sizeof(hashname_t));
-  } else {  
+  } else {
     while(1) {
       if (tp->addr == addr) {
 	/* address already known */
@@ -1123,7 +1123,7 @@ extern void add_host_name(guint addr, const guchar *name)
       tp = tp->next;
     }
   }
-  
+
   strncpy(tp->name, name, MAXNAMELEN);
   tp->name[MAXNAMELEN-1] = '\0';
   tp->addr = addr;
@@ -1140,9 +1140,9 @@ extern guchar *get_udp_port(guint port)
   if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
     if (cur == &str[0][0]) {
       cur = &str[1][0];
-    } else if (cur == &str[1][0]) {  
+    } else if (cur == &str[1][0]) {
       cur = &str[2][0];
-    } else {  
+    } else {
       cur = &str[0][0];
     }
     sprintf(cur, "%u", port);
@@ -1153,7 +1153,7 @@ extern guchar *get_udp_port(guint port)
 
 } /* get_udp_port */
 
-extern guchar *get_tcp_port(guint port) 
+extern guchar *get_tcp_port(guint port)
 {
   static gchar  str[3][MAXNAMELEN];
   static gchar *cur;
@@ -1161,9 +1161,9 @@ extern guchar *get_tcp_port(guint port)
   if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
     if (cur == &str[0][0]) {
       cur = &str[1][0];
-    } else if (cur == &str[1][0]) {  
+    } else if (cur == &str[1][0]) {
       cur = &str[2][0];
-    } else {  
+    } else {
       cur = &str[0][0];
     }
     sprintf(cur, "%u", port);
@@ -1174,7 +1174,7 @@ extern guchar *get_tcp_port(guint port)
 
 } /* get_tcp_port */
 
-extern guchar *get_sctp_port(guint port) 
+extern guchar *get_sctp_port(guint port)
 {
   static gchar  str[3][MAXNAMELEN];
   static gchar *cur;
@@ -1182,9 +1182,9 @@ extern guchar *get_sctp_port(guint port)
   if (!(g_resolv_flags & RESOLV_TRANSPORT)) {
     if (cur == &str[0][0]) {
       cur = &str[1][0];
-    } else if (cur == &str[1][0]) {  
+    } else if (cur == &str[1][0]) {
       cur = &str[2][0];
-    } else {  
+    } else {
       cur = &str[0][0];
     }
     sprintf(cur, "%u", port);
@@ -1222,7 +1222,7 @@ guchar *get_ether_name_if_known(const guint8 *addr)
    * ether-related function called */
   if (!(g_resolv_flags & RESOLV_MAC))
     return NULL;
-  
+
   if (!eth_resolution_initialized) {
     initialize_ethers();
     eth_resolution_initialized = 1;
@@ -1243,7 +1243,7 @@ guchar *get_ether_name_if_known(const guint8 *addr)
 	  (void) eth_name_lookup(addr);
 	  return get_ether_name_if_known(addr); /* a well-placed goto would suffice */
   }
-  else { 
+  else {
     while(1) {
       if (memcmp(tp->addr, addr, sizeof(tp->addr)) == 0) {
 	      if (!tp->is_dummy_entry) {
@@ -1292,7 +1292,7 @@ extern void add_ether_byip(guint ip, const guint8 *eth)
 
   if ((host = host_name_lookup(ip, &found)) == NULL)
     return;
-  
+
   /* ok, we can add this entry in the ethers hashtable */
 
   if (found)
@@ -1349,15 +1349,15 @@ extern const guchar *get_manuf_name(const guint8 *addr)
   if (!(g_resolv_flags & RESOLV_MAC) || ((manufp = manuf_name_lookup(addr)) == NULL)) {
     if (cur == &str[0][0]) {
       cur = &str[1][0];
-    } else if (cur == &str[1][0]) {  
+    } else if (cur == &str[1][0]) {
       cur = &str[2][0];
-    } else {  
+    } else {
       cur = &str[0][0];
     }
     sprintf(cur, "%02x:%02x:%02x", addr[0], addr[1], addr[2]);
     return cur;
   }
-  
+
   return manufp->name;
 
 } /* get_manuf_name */
diff --git a/epan/resolv.h b/epan/resolv.h
index d0dbb2a648..2f779a3068 100644
--- a/epan/resolv.h
+++ b/epan/resolv.h
@@ -1,24 +1,24 @@
 /* resolv.h
  * Definitions for network object lookup
  *
- * $Id: resolv.h,v 1.8 2002/01/13 20:35:10 guy Exp $
+ * $Id: resolv.h,v 1.9 2002/08/28 20:40:45 jmayer Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 41b2093851..212dfec816 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -2,23 +2,23 @@
  * Routines for SNA
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: sna-utils.c,v 1.3 2001/11/13 23:55:37 gram Exp $
+ * $Id: sna-utils.c,v 1.4 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/sna-utils.h b/epan/sna-utils.h
index 0c50a22ae7..d9cb5a837f 100644
--- a/epan/sna-utils.h
+++ b/epan/sna-utils.h
@@ -1,18 +1,18 @@
 /* sna-utils.h
  * Definitions for SNA dissection.
  *
- * $Id: sna-utils.h,v 1.2 2001/04/01 07:06:24 hagbard Exp $
+ * $Id: sna-utils.h,v 1.3 2002/08/28 20:40:45 jmayer Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/strutil.c b/epan/strutil.c
index b5fe3d6bcd..a3aee2c41d 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -1,23 +1,23 @@
 /* strutil.c
  * String utility routines
  *
- * $Id: strutil.c,v 1.8 2002/08/02 21:29:40 jmayer Exp $
+ * $Id: strutil.c,v 1.9 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -112,7 +112,7 @@ get_token_len(const guchar *linep, const guchar *lineend,
   int token_len;
 
   tokenp = linep;
-  
+
   /*
    * Search for a blank, a CR or an LF, or the end of the buffer.
    */
@@ -249,7 +249,7 @@ bytes_to_str(const guint8 *bd, int bd_len) {
   return bytes_to_str_punct(bd,bd_len,'\0');
 }
 
-/* Turn an array of bytes into a string showing the bytes in hex with 
+/* Turn an array of bytes into a string showing the bytes in hex with
  * punct as a bytes separator.
  */
 gchar *
diff --git a/epan/strutil.h b/epan/strutil.h
index 2201c9d6a4..6c03e32810 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -1,22 +1,22 @@
 /* strutil.h
  * String utility definitions
  *
- * $Id: strutil.h,v 1.8 2002/08/02 21:29:40 jmayer Exp $
+ * $Id: strutil.h,v 1.9 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/timestamp.h b/epan/timestamp.h
index af5e7f1410..31067e0dce 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -1,23 +1,23 @@
 /* timestamp.h
  * Defines for packet timestamps
  *
- * $Id: timestamp.h,v 1.1 2001/04/01 06:11:25 hagbard Exp $
+ * $Id: timestamp.h,v 1.2 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/to_str.c b/epan/to_str.c
index bd584c3948..7560573a5e 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1,22 +1,22 @@
 /* to_str.c
  * Routines for utilities to convert various other types to strings.
  *
- * $Id: to_str.c,v 1.16 2002/08/03 19:35:16 guy Exp $
+ * $Id: to_str.c,v 1.17 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -85,9 +85,9 @@ ether_to_str_punct(const guint8 *ad, char punct) {
 
   if (cur == &str[0][0]) {
     cur = &str[1][0];
-  } else if (cur == &str[1][0]) {  
+  } else if (cur == &str[1][0]) {
     cur = &str[2][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
   p = &cur[18];
@@ -118,7 +118,7 @@ ip_to_str(const guint8 *ad) {
     cur = &str[2][0];
   } else if (cur == &str[2][0]) {
     cur = &str[3][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
   ip_to_str_buf(ad, cur);
@@ -216,9 +216,9 @@ ipxnet_to_str_punct(const guint32 ad, char punct)
 
   if (cur == &str[0][0]) {
     cur = &str[1][0];
-  } else if (cur == &str[1][0]) {  
+  } else if (cur == &str[1][0]) {
     cur = &str[2][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
   p = &cur[12];
@@ -325,9 +325,9 @@ time_secs_to_str(guint32 time)
 
   if (cur == &str[0][0]) {
     cur = &str[1][0];
-  } else if (cur == &str[1][0]) {  
+  } else if (cur == &str[1][0]) {
     cur = &str[2][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
 
@@ -349,9 +349,9 @@ time_msecs_to_str(guint32 time)
 
   if (cur == &str[0][0]) {
     cur = &str[1][0];
-  } else if (cur == &str[1][0]) {  
+  } else if (cur == &str[1][0]) {
     cur = &str[2][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
 
diff --git a/epan/to_str.h b/epan/to_str.h
index ce7e516822..f9f65cddff 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -1,22 +1,22 @@
 /* to_str.h
  * Definitions for utilities to convert various other types to strings.
  *
- * $Id: to_str.h,v 1.7 2002/08/02 21:29:40 jmayer Exp $
+ * $Id: to_str.h,v 1.8 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -38,9 +38,9 @@ typedef enum {
 	NSECS	/* nanoseconds */
 } time_res_t;
 
-/* 
+/*
  * These are utility functions which convert various types to strings,
- * but for which no more specific module applies.  
+ * but for which no more specific module applies.
  */
 
 extern gchar*	ether_to_str(const guint8 *);
diff --git a/epan/tvbtest.c b/epan/tvbtest.c
index 303ab57215..0d0e104d6d 100644
--- a/epan/tvbtest.c
+++ b/epan/tvbtest.c
@@ -2,20 +2,20 @@
  *
  * tvbtest : tvbtest.o tvbuff.o except.o
  *
- * $Id: tvbtest.c,v 1.2 2001/11/13 23:55:37 gram Exp $
+ * $Id: tvbtest.c,v 1.3 2002/08/28 20:40:45 jmayer Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -364,7 +364,7 @@ run_tests(void)
 	/* 4 composites */
 	printf("Making Composite 5\n");
 	tvb_comp[5]		= tvb_new_composite();
-	comp_length[5]		= comp_length[0] + 
+	comp_length[5]		= comp_length[0] +
 					comp_length[1] +
 					comp_length[2] +
 					comp_length[3];
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 9f75d7510b..94d707ccb9 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -1,7 +1,7 @@
 /* tvbuff.c
  *
  * Testy, Virtual(-izable) Buffer of guint8*'s
- * 
+ *
  * "Testy" -- the buffer gets mad when an attempt to access data
  * 		beyond the bounds of the buffer. An exception is thrown.
  *
@@ -9,7 +9,7 @@
  * 		the data of a backing tvbuff, or can be a composite of
  * 		other tvbuffs.
  *
- * $Id: tvbuff.c,v 1.39 2002/08/02 21:29:40 jmayer Exp $
+ * $Id: tvbuff.c,v 1.40 2002/08/28 20:40:45 jmayer Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
@@ -19,17 +19,17 @@
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -1021,7 +1021,7 @@ tvb_memdup(tvbuff_t *tvb, gint offset, gint length)
 }
 
 
-	
+
 const guint8*
 tvb_get_ptr(tvbuff_t *tvb, gint offset, gint length)
 {
@@ -1635,7 +1635,7 @@ tvb_format_text(tvbuff_t *tvb, gint offset, gint size)
   }
 
   return format_text(ptr, len);
- 
+
 }
 
 /* Looks for a stringz (NUL-terminated string) in tvbuff and copies
@@ -1934,7 +1934,7 @@ tvb_find_line_end_unquoted(tvbuff_t *tvb, gint offset, int len,
 			*next_offset = eob_offset;
 			break;
 		}
-			
+
 		if (is_quoted) {
 			/*
 			 * We're processing a quoted string.
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index e770ed98ad..1283692d44 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -1,7 +1,7 @@
 /* tvbuff.h
  *
  * Testy, Virtual(-izable) Buffer of guint8*'s
- * 
+ *
  * "Testy" -- the buffer gets mad when an attempt is made to access data
  * 		beyond the bounds of the buffer. An exception is thrown.
  *
@@ -9,24 +9,24 @@
  * 		the data of a backing tvbuff, or can be a composite of
  * 		other tvbuffs.
  *
- * $Id: tvbuff.h,v 1.28 2002/07/17 06:55:24 guy Exp $
+ * $Id: tvbuff.h,v 1.29 2002/08/28 20:40:45 jmayer Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/epan/value_string.c b/epan/value_string.c
index e7fb76978e..36e2e0dd1c 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -1,23 +1,23 @@
 /* value_string.c
  * Routines for value_strings
  *
- * $Id: value_string.c,v 1.3 2001/09/14 07:23:33 guy Exp $
+ * $Id: value_string.c,v 1.4 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -49,9 +49,9 @@ val_to_str(guint32 val, const value_string *vs, const char *fmt) {
     return ret;
   if (cur == &str[0][0]) {
     cur = &str[1][0];
-  } else if (cur == &str[1][0]) {  
+  } else if (cur == &str[1][0]) {
     cur = &str[2][0];
-  } else {  
+  } else {
     cur = &str[0][0];
   }
   snprintf(cur, 64, fmt, val);
@@ -63,7 +63,7 @@ val_to_str(guint32 val, const value_string *vs, const char *fmt) {
 gchar*
 match_strval(guint32 val, const value_string *vs) {
   gint i = 0;
-  
+
   while (vs[i].strptr) {
     if (vs[i].value == val)
       return(vs[i].strptr);
diff --git a/epan/value_string.h b/epan/value_string.h
index c5a439d9ee..233aafff44 100644
--- a/epan/value_string.h
+++ b/epan/value_string.h
@@ -1,23 +1,23 @@
 /* value_string.h
  * Definitions for value_string structures and routines
  *
- * $Id: value_string.h,v 1.2 2001/11/04 03:55:52 guy Exp $
+ * $Id: value_string.h,v 1.3 2002/08/28 20:40:45 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 1998 Gerald Combs
  *
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.