interface.h,netdissect.h: Cleaning unused items

diff --git a/interface.h b/interface.h
index c1ccbe5070347cd6a17c2ac7b097264cef8ff7fa..1a67eb3989837f82e0860e161ebdf7e1c6014446 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -86,8 +86,6 @@ extern void warning(const char *, ...)
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 
-/* The printer routines. */
-
 #include <pcap.h>
 
 #ifndef HAVE_BPF_DUMP

diff --git a/netdissect.h b/netdissect.h
index 19cdfe8b3c688e0420a5e81340dab12f0c27a01e..3b176b0791744d95d5029a4461fa9ee59579edc0 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -120,15 +120,8 @@ struct netdissect_options {
 
   char *ndo_sigsecret;         /* Signature verification secret key */
 
-  struct esp_algorithm *ndo_espsecret_xform;   /* cache of decoded  */
-  char                 *ndo_espsecret_key;
-
   int   ndo_packettype;        /* as specified by -T */
 
-  char *ndo_program_name;      /*used to generate self-identifying messages */
-
-  int32_t ndo_thiszone;        /* seconds offset from gmt to local time */
-
   int   ndo_snaplen;
 
   /*global pointers to beginning and end of current packet (during printing) */
@@ -288,11 +281,6 @@ extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char
 extern void txtproto_print(netdissect_options *, const u_char *, u_int,
     const char *, const char **, u_int);
 
-#if 0
-extern char *read_infile(netdissect_options *, char *);
-extern char *copy_argv(netdissect_options *, char **);
-#endif
-
 /*
  * Locale-independent macros for testing character properties and
  * stripping the 8th bit from characters.  Assumed to be handed
@@ -567,10 +555,6 @@ extern void geneve_print(netdissect_options *, const u_char *, u_int);
 
 /* stuff that has not yet been rototiled */
 
-#if 0
-extern void ascii_print(netdissect_options *,u_int);
-extern void default_print(netdissect_options *,const u_char *, u_int);
-#endif
 extern char *smb_errstr(int, int);
 extern const char *nt_errstr(uint32_t);