summaryrefslogtreecommitdiffstats
path: root/missing
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
commit19d738d1692ee8b11eb2de0f9995732b32cf6bac (patch)
tree35501236837919acfbf69e867f25e6830ee9301d /missing
parentAdding debian version 4.99.4-4. (diff)
downloadtcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.tar.xz
tcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.zip
Merging upstream version 4.99.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'missing')
-rw-r--r--missing/datalinks.c2
-rw-r--r--missing/dlnames.c2
-rw-r--r--missing/getopt_long.c3
-rw-r--r--missing/getservent.c2
-rw-r--r--missing/snprintf.c2
-rw-r--r--missing/strlcat.c2
-rw-r--r--missing/strlcpy.c2
-rw-r--r--missing/strsep.c2
8 files changed, 1 insertions, 16 deletions
diff --git a/missing/datalinks.c b/missing/datalinks.c
index 17f60be..8b45836 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,9 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>
diff --git a/missing/dlnames.c b/missing/dlnames.c
index 03c2b38..87cfb38 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,9 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>
diff --git a/missing/getopt_long.c b/missing/getopt_long.c
index ece0006..e9b1ef5 100644
--- a/missing/getopt_long.c
+++ b/missing/getopt_long.c
@@ -419,8 +419,7 @@ start:
permute_args(nonopt_start, nonopt_end,
optind, nargv);
optind -= nonopt_end - nonopt_start;
- }
- else if (nonopt_start != -1) {
+ } else if (nonopt_start != -1) {
/*
* If we skipped non-options, set optind
* to the first of them.
diff --git a/missing/getservent.c b/missing/getservent.c
index 39cee06..4da2480 100644
--- a/missing/getservent.c
+++ b/missing/getservent.c
@@ -34,9 +34,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>
#include <getservent.h>
diff --git a/missing/snprintf.c b/missing/snprintf.c
index dfff6ee..52eb9a6 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,9 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <stdio.h>
#include <stdarg.h>
diff --git a/missing/strlcat.c b/missing/strlcat.c
index fab7d04..9b64465 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,9 +28,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 9a0b6e6..00792bc 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,9 +28,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>
diff --git a/missing/strsep.c b/missing/strsep.c
index 05f10bc..a07660c 100644
--- a/missing/strsep.c
+++ b/missing/strsep.c
@@ -31,9 +31,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <netdissect-stdinc.h>