Avoid collison with error(), clean up code a bit.

[tcpdump] / addrtoname.h

diff --git a/addrtoname.h b/addrtoname.h
index bdbcf3698d1bc6265d86db1ddcd8cf0b8cb8ddc2..b07d8b29e4cf6ff04e83574c6b3f1bf8323bd49f 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -44,13 +44,14 @@ extern const char *getname(netdissect_options *, const u_char *);
 #ifdef INET6
 extern const char *getname6(netdissect_options *, const u_char *);
 #endif
-extern const char *intoa(u_int32_t);
+extern const char *intoa(uint32_t);
 
-extern void init_addrtoname(netdissect_options *, u_int32_t, u_int32_t);
+extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t);
 extern struct hnamemem *newhnamemem(void);
 #ifdef INET6
 extern struct h6namemem *newh6namemem(void);
 #endif
+extern const char * ieee8021q_tci_string(const uint16_t);
 
 #define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
 #ifdef INET6