diff options
| author | Francois-Xavier Le Bail <fx.lebail@yahoo.com> | 2015-06-10 20:39:54 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <fx.lebail@yahoo.com> | 2015-06-10 20:39:54 +0200 |
| commit | 8aca26be94f1857b182ee835d48564d2c17bbf4c (patch) | |
| tree | 0f161cc06db733088e3ce6abff1f82c4d311c2cd | |
| parent | 1d50dbcd4c9d0bcea568ffacf80946acd5c6e2c0 (diff) | |
| download | tcpdump-8aca26be94f1857b182ee835d48564d2c17bbf4c.tar.gz | |
Move some prototypes in netdissect.h
| -rw-r--r-- | interface.h | 6 | ||||
| -rw-r--r-- | netdissect.h | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/interface.h b/interface.h index ae2a9cd9..2c157844 100644 --- 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 c74906d1..8f98c31b 100644 --- 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 *); |