Use nd_ types, add EXTRACT_ calls.

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 923437888021cf3d251c68b6f3b1ea9b98b96b66..7abf9c41da9edd7095723e42a085be9ea6aa1779 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -26,6 +26,8 @@
 #include "os-proto.h"
 #endif
 
 #include "os-proto.h"
 #endif
 

+#include "funcattrs.h"
+

 /* snprintf et al */
 
 #include <stdarg.h>
 /* snprintf et al */
 
 #include <stdarg.h>


@@ -35,19 +37,13 @@
 #endif
 
 #if !defined(HAVE_SNPRINTF)
 #endif
 
 #if !defined(HAVE_SNPRINTF)

-int snprintf(char *, size_t, const char *, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-     __attribute__((format(printf, 3, 4)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-     ;
+int snprintf(char *, size_t, FORMAT_STRING(const char *), ...)
+     PRINTFLIKE(3, 4);

 #endif /* !defined(HAVE_SNPRINTF) */
 
 #if !defined(HAVE_VSNPRINTF)
 #endif /* !defined(HAVE_SNPRINTF) */
 
 #if !defined(HAVE_VSNPRINTF)

-int vsnprintf(char *, size_t, const char *, va_list)
-#ifdef __ATTRIBUTE___FORMAT_OK
-     __attribute__((format(printf, 3, 0)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-     ;
+int vsnprintf(char *, size_t, FORMAT_STRING(const char *), va_list)
+     PRINTFLIKE(3, 0);

 #endif /* !defined(HAVE_VSNPRINTF) */
 
 #ifndef HAVE_STRLCAT
 #endif /* !defined(HAVE_VSNPRINTF) */
 
 #ifndef HAVE_STRLCAT


@@ -65,38 +61,10 @@ extern char *strdup(const char *);
 extern char *strsep(char **, const char *);
 #endif
 
 extern char *strsep(char **, const char *);
 #endif
 

-#define ESRC(ep) ((ep)->ether_shost)
-#define EDST(ep) ((ep)->ether_dhost)
-
-#ifndef NTOHL
-#define NTOHL(x)       (x) = ntohl(x)
-#define NTOHS(x)       (x) = ntohs(x)
-#define HTONL(x)       (x) = htonl(x)
-#define HTONS(x)       (x) = htons(x)
-#endif

 #endif
 
 extern char *program_name;     /* used to generate self-identifying messages */
 
 #endif
 
 extern char *program_name;     /* used to generate self-identifying messages */
 

-extern int32_t thiszone;       /* seconds offset from gmt to local time */
-
-extern void error(const char *, ...)
-     __attribute__((noreturn))
-#ifdef __ATTRIBUTE___FORMAT_OK
-     __attribute__((format (printf, 1, 2)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-     ;
-extern void warning(const char *, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-     __attribute__((format (printf, 1, 2)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-     ;
-
-extern char *read_infile(char *);
-extern char *copy_argv(char **);
-
-/* The printer routines. */
-

 #include <pcap.h>
 
 #ifndef HAVE_BPF_DUMP
 #include <pcap.h>
 
 #ifndef HAVE_BPF_DUMP


@@ -105,5 +73,3 @@ struct bpf_program;
 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif
 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif

-
-#include "netdissect.h"