Move some prototypes in netdissect.h

diff --git a/interface.h b/interface.h
index ae2a9cd9760ee49265ec70222c6b68e1f0f13cd1..2c157844e470ee168a3bd52ea4b8306ecd7fc0c1 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -99,16 +99,10 @@ extern void warning(const char *, ...)
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
 
-extern const char *dnname_string(u_short);
-extern const char *dnnum_string(u_short);
-
 /* The printer routines. */
 
 #include <pcap.h>
 
-extern char *smb_errstr(int, int);
-extern const char *nt_errstr(uint32_t);
-
 #ifdef INET6
 extern int mask62plen(const u_char *);
 #endif /*INET6*/

diff --git a/netdissect.h b/netdissect.h
index c74906d1d90f550c80e9e27861c8c27d4827662b..8f98c31b4ec1c2991860a6de4682b41662f1536a 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -344,10 +344,8 @@ extern int unaligned_memcmp(const void *, const void *, size_t);
 #define PLURAL_SUFFIX(n) \
        (((n) != 1) ? "s" : "")
 
-#if 0
-extern const char *dnname_string(netdissect_options *, u_short);
-extern const char *dnnum_string(netdissect_options *, u_short);
-#endif
+extern const char *dnname_string(u_short);
+extern const char *dnnum_string(u_short);
 
 /* The printer routines. */
 
@@ -573,9 +571,9 @@ extern void geneve_print(netdissect_options *, const u_char *, u_int);
 #if 0
 extern void ascii_print(netdissect_options *,u_int);
 extern void default_print(netdissect_options *,const u_char *, u_int);
-extern char *smb_errstr(netdissect_options *,int, int);
-extern const char *nt_errstr(netdissect_options *, uint32_t);
 #endif
+extern char *smb_errstr(int, int);
+extern const char *nt_errstr(uint32_t);
 
 extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
 extern u_int ppi_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);