[Martin Mathieson <martin.mathieson@xxxxxxxxxxxx>]

Hi,

Here are some small wiretap-related patches.

wiretap/README.developer
- the referenced default seek_read function doesn't exist now

wiretap/wtap.c
- a "hole" in encap_table was causing the wrong encap value for later 
types to be looked up (by name)

mergecap.c
- fix a couple of program name copy+paste errors from editcap.c

Regards,
Martin

Index: mergecap.c
===================================================================
--- mergecap.c	(revision 17755)
+++ mergecap.c	(working copy)
@@ -116,7 +116,7 @@
 static void list_capture_types(void) {
     int i;
 
-    fprintf(stderr, "editcap: The available capture file types for \"F\":\n");
+    fprintf(stderr, "mergecap: The available capture file types for \"F\":\n");
     for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
       if (wtap_dump_can_open(i))
         fprintf(stderr, "    %s - %s\n",
@@ -128,7 +128,7 @@
     int i;
     const char *string;
 
-    fprintf(stderr, "editcap: The available encapsulation types for \"T\":\n");
+    fprintf(stderr, "mergecap: The available encapsulation types for \"T\":\n");
     for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
         string = wtap_encap_short_string(i);
         if (string != NULL)

Index: README.developer
===================================================================
--- README.developer	(revision 17755)
+++ README.developer	(working copy)
@@ -23,8 +23,7 @@
 
 	write a "seek and read" routine, if necessary, and have the
 	"open" routine set the "subtype_seek_read" member of the "wtap"
-	structure to point to that routine, otherwise set it to
-	"wtap_def_seek_read";
+	structure to point to that routine.
 
 	write a "close" routine, if necessary (if, for example, the
 	"open" routine allocates any memory), and set the

Index: wtap.c
===================================================================
--- wtap.c	(revision 17755)
+++ wtap.c	(working copy)
@@ -351,6 +351,9 @@
 
 	/* WTAP_ENCAP_JUNIPER_CHDLC */
 	{ "Juniper C-HDLC", "juniper-chdlc" },
+    
+	/* WTAP_ENCAP_JUNIPER_GGSN */
+	{ "Juniper GGSN", "juniper-ggsn" },
 
  	/* WTAP_ENCAP_LINUX_LAPD */
  	{ "LAPD", "lapd" },