CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 1a67eb3989837f82e0860e161ebdf7e1c6014446..affa019cbd9ac18ae4e7cf7df7c996bd66e9dd07 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -26,29 +26,10 @@
 #include "os-proto.h"
 #endif
 
 #include "os-proto.h"
 #endif
 

-/* snprintf et al */
+#include "funcattrs.h"

 
 #include <stdarg.h>
 
 #include <stdarg.h>

-
-#if HAVE_STDINT_H

 #include <stdint.h>
 #include <stdint.h>

-#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 */
-     ;
-#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 */
-     ;
-#endif /* !defined(HAVE_VSNPRINTF) */

 
 #ifndef HAVE_STRLCAT
 extern size_t strlcat(char *, const char *, size_t);
 
 #ifndef HAVE_STRLCAT
 extern size_t strlcat(char *, const char *, size_t);


@@ -57,10 +38,6 @@ extern size_t strlcat(char *, const char *, size_t);
 extern size_t strlcpy(char *, const char *, size_t);
 #endif
 
 extern size_t strlcpy(char *, const char *, size_t);
 #endif
 

-#ifndef HAVE_STRDUP
-extern char *strdup(const char *);
-#endif
-

 #ifndef HAVE_STRSEP
 extern char *strsep(char **, const char *);
 #endif
 #ifndef HAVE_STRSEP
 extern char *strsep(char **, const char *);
 #endif


@@ -69,30 +46,17 @@ extern char *strsep(char **, const char *);
 
 extern char *program_name;     /* used to generate self-identifying messages */
 
 
 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 **);
-

 #include <pcap.h>
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
 #include <pcap.h>
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;

+#endif

 
 

+/*
+ * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set.
+ */
+#if !defined(HAVE_BPF_DUMP) || \
+    (defined(HAVE_BPF_DUMP) && defined(HAVE_CAPSICUM) && !defined(bpf_dump))

 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif
 extern void bpf_dump(const struct bpf_program *, int);
 
 #endif

-
-#include "netdissect.h"