From: Todd C. Miller Date: Sat, 20 Jun 2015 11:34:35 +0000 (-0600) Subject: Only include stddef.h where it is needed. X-Git-Tag: SUDO_1_8_14^2~62 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a07b472f0fe62fe8941319209d15bcafa5386e6;p=sudo Only include stddef.h where it is needed. --- diff --git a/include/sudo_compat.h b/include/sudo_compat.h index b883afe22..4161ee887 100644 --- a/include/sudo_compat.h +++ b/include/sudo_compat.h @@ -23,7 +23,6 @@ #define SUDO_COMPAT_H #include -#include #include /* @@ -231,17 +230,6 @@ #undef ISSET #define ISSET(t, f) ((t) & (f)) -/* - * Older systems may be missing stddef.h and/or offsetof macro - */ -#ifndef offsetof -# ifdef __offsetof -# define offsetof(type, field) __offsetof(type, field) -# else -# define offsetof(type, field) ((size_t)(&((type *)0)->field)) -# endif -#endif - /* * Simple isblank() macro and function for systems without it. */ diff --git a/lib/util/aix.c b/lib/util/aix.c index c8966bbdc..501bcda3a 100644 --- a/lib/util/aix.c +++ b/lib/util/aix.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/lib/util/closefrom.c b/lib/util/closefrom.c index 45501ae20..98b2e2ba8 100644 --- a/lib/util/closefrom.c +++ b/lib/util/closefrom.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #ifdef HAVE_PSTAT_GETPROC diff --git a/lib/util/event.c b/lib/util/event.c index cc4322e79..0f209eb8d 100644 --- a/lib/util/event.c +++ b/lib/util/event.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/lib/util/event_poll.c b/lib/util/event_poll.c index 4912078e2..e2454c003 100644 --- a/lib/util/event_poll.c +++ b/lib/util/event_poll.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/lib/util/event_select.c b/lib/util/event_select.c index 16344aa89..a63d9c063 100644 --- a/lib/util/event_select.c +++ b/lib/util/event_select.c @@ -26,7 +26,6 @@ #endif /* HAVE_SYS_SELECT_H */ #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/lib/util/getaddrinfo.c b/lib/util/getaddrinfo.c index 4f0c29fdb..1a24d9d8f 100644 --- a/lib/util/getaddrinfo.c +++ b/lib/util/getaddrinfo.c @@ -39,7 +39,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/getcwd.c b/lib/util/getcwd.c index df6486eca..3d9d8a17c 100644 --- a/lib/util/getcwd.c +++ b/lib/util/getcwd.c @@ -37,7 +37,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/getgrouplist.c b/lib/util/getgrouplist.c index 7dc69610d..29e70d557 100644 --- a/lib/util/getgrouplist.c +++ b/lib/util/getgrouplist.c @@ -22,7 +22,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/gethostname.c b/lib/util/gethostname.c index 382ac2bb5..7f24458d6 100644 --- a/lib/util/gethostname.c +++ b/lib/util/gethostname.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "sudo_compat.h" diff --git a/lib/util/getline.c b/lib/util/getline.c index d705911dc..60bc6f918 100644 --- a/lib/util/getline.c +++ b/lib/util/getline.c @@ -22,7 +22,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/getopt_long.c b/lib/util/getopt_long.c index 9465f47aa..2cebe40d3 100644 --- a/lib/util/getopt_long.c +++ b/lib/util/getopt_long.c @@ -55,7 +55,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/gettime.c b/lib/util/gettime.c index f0139e285..8eae8047d 100644 --- a/lib/util/gettime.c +++ b/lib/util/gettime.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/lib/util/gidlist.c b/lib/util/gidlist.c index cd30e79cf..c65f0f4ce 100644 --- a/lib/util/gidlist.c +++ b/lib/util/gidlist.c @@ -20,7 +20,6 @@ #include #include -#include #include #define DEFAULT_TEXT_DOMAIN "sudo" diff --git a/lib/util/glob.c b/lib/util/glob.c index 3f0b44ec3..9c177e790 100644 --- a/lib/util/glob.c +++ b/lib/util/glob.c @@ -59,7 +59,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/key_val.c b/lib/util/key_val.c index 7b1231ec8..34a5e6e3a 100644 --- a/lib/util/key_val.c +++ b/lib/util/key_val.c @@ -20,7 +20,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c index c87c40f44..ae4afbf83 100644 --- a/lib/util/lbuf.c +++ b/lib/util/lbuf.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/locking.c b/lib/util/locking.c index e7c6a07db..879e2b4f2 100644 --- a/lib/util/locking.c +++ b/lib/util/locking.c @@ -26,7 +26,6 @@ # include #endif /* HAVE_FLOCK */ #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/mksiglist.c b/lib/util/mksiglist.c index 5a82370f6..cad81797e 100644 --- a/lib/util/mksiglist.c +++ b/lib/util/mksiglist.c @@ -21,7 +21,6 @@ #include #include -#include #include #include "sudo_compat.h" diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c index d221638ce..cd4ebf2a2 100644 --- a/lib/util/mksigname.c +++ b/lib/util/mksigname.c @@ -21,7 +21,6 @@ #include #include -#include #include #include "sudo_compat.h" diff --git a/lib/util/parseln.c b/lib/util/parseln.c index 70e05cd26..71486e521 100644 --- a/lib/util/parseln.c +++ b/lib/util/parseln.c @@ -19,7 +19,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/progname.c b/lib/util/progname.c index 67b676709..e99febd42 100644 --- a/lib/util/progname.c +++ b/lib/util/progname.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/pw_dup.c b/lib/util/pw_dup.c index 1a901d773..25ebd07c6 100644 --- a/lib/util/pw_dup.c +++ b/lib/util/pw_dup.c @@ -27,7 +27,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/reallocarray.c b/lib/util/reallocarray.c index 37b2f75ef..49aa0524f 100644 --- a/lib/util/reallocarray.c +++ b/lib/util/reallocarray.c @@ -21,7 +21,6 @@ #include #include -#include #if defined(HAVE_STDINT_H) # include #elif defined(HAVE_INTTYPES_H) diff --git a/lib/util/regress/atofoo/atofoo_test.c b/lib/util/regress/atofoo/atofoo_test.c index fa4f53232..62cbbd070 100644 --- a/lib/util/regress/atofoo/atofoo_test.c +++ b/lib/util/regress/atofoo/atofoo_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/lib/util/regress/parse_gids/parse_gids_test.c b/lib/util/regress/parse_gids/parse_gids_test.c index dcc343824..13c4d544a 100644 --- a/lib/util/regress/parse_gids/parse_gids_test.c +++ b/lib/util/regress/parse_gids/parse_gids_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/regress/progname/progname_test.c b/lib/util/regress/progname/progname_test.c index 83deddf98..2a58a585f 100644 --- a/lib/util/regress/progname/progname_test.c +++ b/lib/util/regress/progname/progname_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/regress/strsplit/strsplit_test.c b/lib/util/regress/strsplit/strsplit_test.c index 7e5455d3f..4a2919eae 100644 --- a/lib/util/regress/strsplit/strsplit_test.c +++ b/lib/util/regress/strsplit/strsplit_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c index d9e8e41de..4a03f3179 100644 --- a/lib/util/regress/sudo_conf/conf_test.c +++ b/lib/util/regress/sudo_conf/conf_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c index f6bd5be45..9dac11ec2 100644 --- a/lib/util/regress/sudo_parseln/parseln_test.c +++ b/lib/util/regress/sudo_parseln/parseln_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/setgroups.c b/lib/util/setgroups.c index d5e9b8733..80204a503 100644 --- a/lib/util/setgroups.c +++ b/lib/util/setgroups.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/lib/util/sha2.c b/lib/util/sha2.c index 0c7d11ec6..b04abd91f 100644 --- a/lib/util/sha2.c +++ b/lib/util/sha2.c @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/sig2str.c b/lib/util/sig2str.c index 9980fbfc9..7b4426b58 100644 --- a/lib/util/sig2str.c +++ b/lib/util/sig2str.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c index 429032dff..ff87dd48c 100644 --- a/lib/util/snprintf.c +++ b/lib/util/snprintf.c @@ -54,8 +54,8 @@ #endif #include #include -#include #include +#include #if defined(HAVE_STDINT_H) # include #elif defined(HAVE_INTTYPES_H) diff --git a/lib/util/strndup.c b/lib/util/strndup.c index c07531d0e..fc617e314 100644 --- a/lib/util/strndup.c +++ b/lib/util/strndup.c @@ -23,7 +23,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/strsplit.c b/lib/util/strsplit.c index 1a040a6e7..d63cbd047 100644 --- a/lib/util/strsplit.c +++ b/lib/util/strsplit.c @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/lib/util/strtobool.c b/lib/util/strtobool.c index 3413a729b..755501cdc 100644 --- a/lib/util/strtobool.c +++ b/lib/util/strtobool.c @@ -20,7 +20,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/strtoid.c b/lib/util/strtoid.c index 769278e90..a38bd3535 100644 --- a/lib/util/strtoid.c +++ b/lib/util/strtoid.c @@ -20,7 +20,6 @@ #include #include -#include #if defined(HAVE_STDINT_H) # include #elif defined(HAVE_INTTYPES_H) diff --git a/lib/util/strtomode.c b/lib/util/strtomode.c index b2091f939..5eeae5860 100644 --- a/lib/util/strtomode.c +++ b/lib/util/strtomode.c @@ -20,7 +20,6 @@ #include #include -#include #include #define DEFAULT_TEXT_DOMAIN "sudo" diff --git a/lib/util/strtonum.c b/lib/util/strtonum.c index 1a60013d3..bad90a68d 100644 --- a/lib/util/strtonum.c +++ b/lib/util/strtonum.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/sudo_conf.c b/lib/util/sudo_conf.c index db20b1be2..efee7e70e 100644 --- a/lib/util/sudo_conf.c +++ b/lib/util/sudo_conf.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/lib/util/sudo_debug.c b/lib/util/sudo_debug.c index 9754a6394..9e1089746 100644 --- a/lib/util/sudo_debug.c +++ b/lib/util/sudo_debug.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/sudo_dso.c b/lib/util/sudo_dso.c index e929577cd..19b53025e 100644 --- a/lib/util/sudo_dso.c +++ b/lib/util/sudo_dso.c @@ -20,7 +20,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/term.c b/lib/util/term.c index d2dcefd93..26c31b348 100644 --- a/lib/util/term.c +++ b/lib/util/term.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/lib/util/ttysize.c b/lib/util/ttysize.c index 6f5489aa1..7a5416314 100644 --- a/lib/util/ttysize.c +++ b/lib/util/ttysize.c @@ -22,7 +22,6 @@ #include #include #include -#include #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ diff --git a/plugins/group_file/getgrent.c b/plugins/group_file/getgrent.c index 1c39126b9..99eeca101 100644 --- a/plugins/group_file/getgrent.c +++ b/plugins/group_file/getgrent.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c index 336ee2c65..53bb08b25 100644 --- a/plugins/group_file/group_file.c +++ b/plugins/group_file/group_file.c @@ -21,7 +21,6 @@ #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/plugins/group_file/plugin_test.c b/plugins/group_file/plugin_test.c index 1be808ab5..d16d86883 100644 --- a/plugins/group_file/plugin_test.c +++ b/plugins/group_file/plugin_test.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c index 5fefcb21c..44ff6aeef 100644 --- a/plugins/sample/sample_plugin.c +++ b/plugins/sample/sample_plugin.c @@ -22,7 +22,6 @@ #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c index 0bde58f47..9ea70c5f3 100644 --- a/plugins/sudoers/alias.c +++ b/plugins/sudoers/alias.c @@ -22,7 +22,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/audit.c b/plugins/sudoers/audit.c index ddf97bc4c..768400cb5 100644 --- a/plugins/sudoers/audit.c +++ b/plugins/sudoers/audit.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "sudoers.h" diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c index 67aa9386c..c10913bfb 100644 --- a/plugins/sudoers/auth/afs.c +++ b/plugins/sudoers/auth/afs.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c index 9a79b2739..4b26c67e4 100644 --- a/plugins/sudoers/auth/aix_auth.c +++ b/plugins/sudoers/auth/aix_auth.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c index 20d0a993b..1c40e9348 100644 --- a/plugins/sudoers/auth/bsdauth.c +++ b/plugins/sudoers/auth/bsdauth.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c index 674936ffb..eabc7dd00 100644 --- a/plugins/sudoers/auth/dce.c +++ b/plugins/sudoers/auth/dce.c @@ -40,7 +40,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c index 9967c9049..43aa279ca 100644 --- a/plugins/sudoers/auth/fwtk.c +++ b/plugins/sudoers/auth/fwtk.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c index f356d0fbe..c8550a27a 100644 --- a/plugins/sudoers/auth/kerb5.c +++ b/plugins/sudoers/auth/kerb5.c @@ -29,7 +29,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c index d1bfc9732..5df068f85 100644 --- a/plugins/sudoers/auth/pam.c +++ b/plugins/sudoers/auth/pam.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c index 18074bf55..3e7dee699 100644 --- a/plugins/sudoers/auth/passwd.c +++ b/plugins/sudoers/auth/passwd.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c index f336a7c0b..8dc7dd929 100644 --- a/plugins/sudoers/auth/rfc1938.c +++ b/plugins/sudoers/auth/rfc1938.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c index f482841af..c6f326eb2 100644 --- a/plugins/sudoers/auth/secureware.c +++ b/plugins/sudoers/auth/secureware.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c index f7833f5cb..1ce73c02a 100644 --- a/plugins/sudoers/auth/securid5.c +++ b/plugins/sudoers/auth/securid5.c @@ -30,7 +30,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c index 4b78ca512..5d400524a 100644 --- a/plugins/sudoers/auth/sia.c +++ b/plugins/sudoers/auth/sia.c @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c index dba71bac8..61378a166 100644 --- a/plugins/sudoers/auth/sudo_auth.c +++ b/plugins/sudoers/auth/sudo_auth.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/base64.c b/plugins/sudoers/base64.c index 009ce8e35..23b402007 100644 --- a/plugins/sudoers/base64.c +++ b/plugins/sudoers/base64.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c index a151f56ed..ad393b26e 100644 --- a/plugins/sudoers/boottime.c +++ b/plugins/sudoers/boottime.c @@ -21,7 +21,6 @@ #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c index 26168ba26..ff2c0842e 100644 --- a/plugins/sudoers/check.c +++ b/plugins/sudoers/check.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c index 0e2bf3555..5e6b29105 100644 --- a/plugins/sudoers/defaults.c +++ b/plugins/sudoers/defaults.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c index 25c1196e5..8ffc37af3 100644 --- a/plugins/sudoers/editor.c +++ b/plugins/sudoers/editor.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c index 24273f0d0..060a15aa9 100644 --- a/plugins/sudoers/env.c +++ b/plugins/sudoers/env.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c index f3cedba05..6c9f47aa3 100644 --- a/plugins/sudoers/find_path.c +++ b/plugins/sudoers/find_path.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/getdate.c b/plugins/sudoers/getdate.c index d3754945d..526156a40 100644 --- a/plugins/sudoers/getdate.c +++ b/plugins/sudoers/getdate.c @@ -30,7 +30,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ @@ -111,7 +110,7 @@ static int yyerror(const char *s); static int yylex(void); int yyparse(void); -#line 104 "getdate.y" +#line 103 "getdate.y" #ifndef YYSTYPE_DEFINED #define YYSTYPE_DEFINED typedef union { @@ -119,7 +118,7 @@ typedef union { enum _MERIDIAN Meridian; } YYSTYPE; #endif /* YYSTYPE_DEFINED */ -#line 122 "getdate.c" +#line 121 "getdate.c" #define tAGO 257 #define tDAY 258 #define tDAYZONE 259 @@ -387,7 +386,7 @@ short *yyss; short *yysslim; YYSTYPE *yyvs; unsigned int yystacksize; -#line 323 "getdate.y" +#line 322 "getdate.y" /* Month and day table. */ static TABLE const MonthDayTable[] = { @@ -1009,7 +1008,7 @@ main(int argc, char *argv[]) /* NOTREACHED */ } #endif /* TEST */ -#line 960 "getdate.c" +#line 959 "getdate.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || defined(__STDC__) static int yygrowstack(void) @@ -1218,37 +1217,37 @@ yyreduce: switch (yyn) { case 3: -#line 122 "getdate.y" +#line 121 "getdate.y" { yyHaveTime++; } break; case 4: -#line 125 "getdate.y" +#line 124 "getdate.y" { yyHaveZone++; } break; case 5: -#line 128 "getdate.y" +#line 127 "getdate.y" { yyHaveDate++; } break; case 6: -#line 131 "getdate.y" +#line 130 "getdate.y" { yyHaveDay++; } break; case 7: -#line 134 "getdate.y" +#line 133 "getdate.y" { yyHaveRel++; } break; case 9: -#line 140 "getdate.y" +#line 139 "getdate.y" { yyHour = yyvsp[-1].Number; yyMinutes = 0; @@ -1257,7 +1256,7 @@ case 9: } break; case 10: -#line 146 "getdate.y" +#line 145 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1266,7 +1265,7 @@ case 10: } break; case 11: -#line 152 "getdate.y" +#line 151 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1276,7 +1275,7 @@ case 11: } break; case 12: -#line 159 "getdate.y" +#line 158 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1285,7 +1284,7 @@ case 12: } break; case 13: -#line 165 "getdate.y" +#line 164 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1296,56 +1295,56 @@ case 13: } break; case 14: -#line 175 "getdate.y" +#line 174 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSToff; } break; case 15: -#line 179 "getdate.y" +#line 178 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSTon; } break; case 16: -#line 184 "getdate.y" +#line 183 "getdate.y" { yyTimezone = yyvsp[-1].Number; yyDSTmode = DSTon; } break; case 17: -#line 190 "getdate.y" +#line 189 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[0].Number; } break; case 18: -#line 194 "getdate.y" +#line 193 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[-1].Number; } break; case 19: -#line 198 "getdate.y" +#line 197 "getdate.y" { yyDayOrdinal = yyvsp[-1].Number; yyDayNumber = yyvsp[0].Number; } break; case 20: -#line 204 "getdate.y" +#line 203 "getdate.y" { yyMonth = yyvsp[-2].Number; yyDay = yyvsp[0].Number; } break; case 21: -#line 208 "getdate.y" +#line 207 "getdate.y" { if (yyvsp[-4].Number >= 100) { yyYear = yyvsp[-4].Number; @@ -1359,7 +1358,7 @@ case 21: } break; case 22: -#line 219 "getdate.y" +#line 218 "getdate.y" { /* ISO 8601 format. yyyy-mm-dd. */ yyYear = yyvsp[-2].Number; @@ -1368,7 +1367,7 @@ case 22: } break; case 23: -#line 225 "getdate.y" +#line 224 "getdate.y" { /* e.g. 17-JUN-1992. */ yyDay = yyvsp[-2].Number; @@ -1377,14 +1376,14 @@ case 23: } break; case 24: -#line 231 "getdate.y" +#line 230 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[0].Number; } break; case 25: -#line 235 "getdate.y" +#line 234 "getdate.y" { yyMonth = yyvsp[-3].Number; yyDay = yyvsp[-2].Number; @@ -1392,14 +1391,14 @@ case 25: } break; case 26: -#line 240 "getdate.y" +#line 239 "getdate.y" { yyMonth = yyvsp[0].Number; yyDay = yyvsp[-1].Number; } break; case 27: -#line 244 "getdate.y" +#line 243 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[-2].Number; @@ -1407,68 +1406,68 @@ case 27: } break; case 28: -#line 251 "getdate.y" +#line 250 "getdate.y" { yyRelSeconds = -yyRelSeconds; yyRelMonth = -yyRelMonth; } break; case 30: -#line 258 "getdate.y" +#line 257 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 31: -#line 261 "getdate.y" +#line 260 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 32: -#line 264 "getdate.y" +#line 263 "getdate.y" { yyRelSeconds += yyvsp[0].Number * 60L; } break; case 33: -#line 267 "getdate.y" +#line 266 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 34: -#line 270 "getdate.y" +#line 269 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 35: -#line 273 "getdate.y" +#line 272 "getdate.y" { yyRelSeconds++; } break; case 36: -#line 276 "getdate.y" +#line 275 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 37: -#line 279 "getdate.y" +#line 278 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 38: -#line 282 "getdate.y" +#line 281 "getdate.y" { yyRelMonth += yyvsp[0].Number; } break; case 39: -#line 287 "getdate.y" +#line 286 "getdate.y" { if (yyHaveTime && yyHaveDate && !yyHaveRel) yyYear = yyvsp[0].Number; @@ -1496,18 +1495,18 @@ case 39: } break; case 40: -#line 314 "getdate.y" +#line 313 "getdate.y" { yyval.Meridian = MER24; } break; case 41: -#line 317 "getdate.y" +#line 316 "getdate.y" { yyval.Meridian = yyvsp[0].Meridian; } break; -#line 1458 "getdate.c" +#line 1457 "getdate.c" } yyssp -= yym; yystate = *yyssp; diff --git a/plugins/sudoers/getdate.y b/plugins/sudoers/getdate.y index d03eb1b75..a213ba0b0 100644 --- a/plugins/sudoers/getdate.y +++ b/plugins/sudoers/getdate.y @@ -18,7 +18,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c index 9ac07a212..2615db516 100644 --- a/plugins/sudoers/getspwuid.c +++ b/plugins/sudoers/getspwuid.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c index 2d1395cc7..36d15ffc1 100644 --- a/plugins/sudoers/group_plugin.c +++ b/plugins/sudoers/group_plugin.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c index 822ac1890..47a62b424 100644 --- a/plugins/sudoers/interfaces.c +++ b/plugins/sudoers/interfaces.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c index af32dc69c..6fd214984 100644 --- a/plugins/sudoers/iolog.c +++ b/plugins/sudoers/iolog.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c index 3fed95445..b0c30bba9 100644 --- a/plugins/sudoers/iolog_path.c +++ b/plugins/sudoers/iolog_path.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/linux_audit.c b/plugins/sudoers/linux_audit.c index 1b068f6e2..ec0437f6e 100644 --- a/plugins/sudoers/linux_audit.c +++ b/plugins/sudoers/linux_audit.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/sudoers/locale.c b/plugins/sudoers/locale.c index 1259149cd..74be2646e 100644 --- a/plugins/sudoers/locale.c +++ b/plugins/sudoers/locale.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index fa57207be..cd2322d51 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -30,7 +30,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/logwrap.c b/plugins/sudoers/logwrap.c index 4fe26b7f5..8b09be4d5 100644 --- a/plugins/sudoers/logwrap.c +++ b/plugins/sudoers/logwrap.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c index 1c0d400be..2db363517 100644 --- a/plugins/sudoers/match.c +++ b/plugins/sudoers/match.c @@ -30,7 +30,6 @@ #endif #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c index f79a84d9c..21de1a08e 100644 --- a/plugins/sudoers/match_addr.c +++ b/plugins/sudoers/match_addr.c @@ -27,7 +27,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c index 2cb424e84..00f8f96f3 100644 --- a/plugins/sudoers/parse.c +++ b/plugins/sudoers/parse.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c index d7aa9b3ae..3db9c4093 100644 --- a/plugins/sudoers/policy.c +++ b/plugins/sudoers/policy.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/prompt.c b/plugins/sudoers/prompt.c index 3e76d5e9a..eaec99057 100644 --- a/plugins/sudoers/prompt.c +++ b/plugins/sudoers/prompt.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c index 0bdf7bec7..65fcf3a90 100644 --- a/plugins/sudoers/pwutil_impl.c +++ b/plugins/sudoers/pwutil_impl.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c index 82103cd37..a12085701 100644 --- a/plugins/sudoers/redblack.c +++ b/plugins/sudoers/redblack.c @@ -46,7 +46,6 @@ #include #include -#include #include "sudoers.h" #include "redblack.h" diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c index 4edb1ea57..6d104abf5 100644 --- a/plugins/sudoers/regress/check_symbols/check_symbols.c +++ b/plugins/sudoers/regress/check_symbols/check_symbols.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c index d93e8eab5..dd06d4c84 100644 --- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c +++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c index 2c38213da..dcda5dc0c 100644 --- a/plugins/sudoers/regress/logging/check_wrap.c +++ b/plugins/sudoers/regress/logging/check_wrap.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c index 2a349efd2..eb4619a1c 100644 --- a/plugins/sudoers/regress/parser/check_addr.c +++ b/plugins/sudoers/regress/parser/check_addr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #ifdef HAVE_STRING_H # include diff --git a/plugins/sudoers/regress/parser/check_base64.c b/plugins/sudoers/regress/parser/check_base64.c index 428138381..53753020a 100644 --- a/plugins/sudoers/regress/parser/check_base64.c +++ b/plugins/sudoers/regress/parser/check_base64.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/regress/parser/check_digest.c b/plugins/sudoers/regress/parser/check_digest.c index 87a33d97e..f9d571675 100644 --- a/plugins/sudoers/regress/parser/check_digest.c +++ b/plugins/sudoers/regress/parser/check_digest.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/regress/parser/check_fill.c b/plugins/sudoers/regress/parser/check_fill.c index ab3200d39..85dce0faf 100644 --- a/plugins/sudoers/regress/parser/check_fill.c +++ b/plugins/sudoers/regress/parser/check_fill.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/plugins/sudoers/regress/parser/check_hexchar.c b/plugins/sudoers/regress/parser/check_hexchar.c index 22229dbe4..320d175f6 100644 --- a/plugins/sudoers/regress/parser/check_hexchar.c +++ b/plugins/sudoers/regress/parser/check_hexchar.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c index 1a27b0a8b..7fb44fee8 100644 --- a/plugins/sudoers/set_perms.c +++ b/plugins/sudoers/set_perms.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c index 017b14623..a30fdf9f5 100644 --- a/plugins/sudoers/sssd.c +++ b/plugins/sudoers/sssd.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c index 5e0ee65e0..773c1449f 100644 --- a/plugins/sudoers/sudo_nss.c +++ b/plugins/sudoers/sudo_nss.c @@ -21,7 +21,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/sudo_printf.c b/plugins/sudoers/sudo_printf.c index e5f02fb32..465eef8cd 100644 --- a/plugins/sudoers/sudo_printf.c +++ b/plugins/sudoers/sudo_printf.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index be16eb95b..256e43a93 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -30,7 +30,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/sudoers_debug.c b/plugins/sudoers/sudoers_debug.c index f9b34981f..3d3b7aa16 100644 --- a/plugins/sudoers/sudoers_debug.c +++ b/plugins/sudoers/sudoers_debug.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c index f39d7be6c..3edffd248 100644 --- a/plugins/sudoers/sudoreplay.c +++ b/plugins/sudoers/sudoreplay.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c index 13fb074ed..e213d0cc2 100644 --- a/plugins/sudoers/testsudoers.c +++ b/plugins/sudoers/testsudoers.c @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c index 933de0220..af5d000ba 100644 --- a/plugins/sudoers/timestamp.c +++ b/plugins/sudoers/timestamp.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/timestr.c b/plugins/sudoers/timestr.c index 434640d65..0d977d96b 100644 --- a/plugins/sudoers/timestr.c +++ b/plugins/sudoers/timestr.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "sudo_compat.h" diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 09dd634e7..eab4a0544 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -1963,7 +1963,6 @@ char *yytext; #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l index 53eb4150a..8781aebd6 100644 --- a/plugins/sudoers/toke.l +++ b/plugins/sudoers/toke.l @@ -29,7 +29,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c index a91225e4f..67d071431 100644 --- a/plugins/sudoers/toke_util.c +++ b/plugins/sudoers/toke_util.c @@ -27,7 +27,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c index 3a68694eb..04bfdbda7 100644 --- a/plugins/sudoers/tsgetgrpw.c +++ b/plugins/sudoers/tsgetgrpw.c @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c index 42c63b0e1..04fd5bc6f 100644 --- a/plugins/sudoers/visudo.c +++ b/plugins/sudoers/visudo.c @@ -40,7 +40,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/sudoers/visudo_json.c b/plugins/sudoers/visudo_json.c index 41ce43aac..cbecbf8a6 100644 --- a/plugins/sudoers/visudo_json.c +++ b/plugins/sudoers/visudo_json.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c index 7ac02d45c..728662798 100644 --- a/plugins/system_group/system_group.c +++ b/plugins/system_group/system_group.c @@ -21,7 +21,6 @@ #include #include -#include #ifdef HAVE_STDBOOL_H # include #else diff --git a/src/conversation.c b/src/conversation.c index a82f1f099..7035f6c40 100644 --- a/src/conversation.c +++ b/src/conversation.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/env_hooks.c b/src/env_hooks.c index a39ee8b2f..d05331d26 100644 --- a/src/env_hooks.c +++ b/src/env_hooks.c @@ -20,7 +20,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/exec.c b/src/exec.c index be248a004..c41dc3a1c 100644 --- a/src/exec.c +++ b/src/exec.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/exec_common.c b/src/exec_common.c index 939e62d2c..32e99fe52 100644 --- a/src/exec_common.c +++ b/src/exec_common.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/exec_pty.c b/src/exec_pty.c index f2999c202..58cd53c46 100644 --- a/src/exec_pty.c +++ b/src/exec_pty.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/get_pty.c b/src/get_pty.c index 86defe0ba..e72db2c83 100644 --- a/src/get_pty.c +++ b/src/get_pty.c @@ -25,7 +25,6 @@ #endif /* HAVE_SYS_STROPTS_H */ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/hooks.c b/src/hooks.c index 4bd7da440..c64b69b20 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/load_plugins.c b/src/load_plugins.c index 11b0da12a..95bdd830d 100644 --- a/src/load_plugins.c +++ b/src/load_plugins.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/net_ifs.c b/src/net_ifs.c index d3b3bda94..f5d39e71f 100644 --- a/src/net_ifs.c +++ b/src/net_ifs.c @@ -39,7 +39,6 @@ struct rtentry; #endif #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/openbsd.c b/src/openbsd.c index 585f84cdf..fb889e83c 100644 --- a/src/openbsd.c +++ b/src/openbsd.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/parse_args.c b/src/parse_args.c index c0a2ba507..1d7da7639 100644 --- a/src/parse_args.c +++ b/src/parse_args.c @@ -24,7 +24,6 @@ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/preserve_fds.c b/src/preserve_fds.c index 5926deb0b..d0ab439e8 100644 --- a/src/preserve_fds.c +++ b/src/preserve_fds.c @@ -25,7 +25,6 @@ #endif /* HAVE_SYS_SELECT_H */ #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/regress/ttyname/check_ttyname.c b/src/regress/ttyname/check_ttyname.c index 4c6eb1d8e..b4b2c3469 100644 --- a/src/regress/ttyname/check_ttyname.c +++ b/src/regress/ttyname/check_ttyname.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/selinux.c b/src/selinux.c index 76d25acb0..8cadc5dd1 100644 --- a/src/selinux.c +++ b/src/selinux.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/signal.c b/src/signal.c index 95601365c..f1c875dc5 100644 --- a/src/signal.c +++ b/src/signal.c @@ -19,7 +19,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/solaris.c b/src/solaris.c index ab96676b1..ec5e9ca9b 100644 --- a/src/solaris.c +++ b/src/solaris.c @@ -20,7 +20,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/sudo.c b/src/sudo.c index 8dd708454..30a17931a 100644 --- a/src/sudo.c +++ b/src/sudo.c @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/sudo_edit.c b/src/sudo_edit.c index d20d3c956..5c170405f 100644 --- a/src/sudo_edit.c +++ b/src/sudo_edit.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/tgetpass.c b/src/tgetpass.c index 299dd2c81..57a70cc2a 100644 --- a/src/tgetpass.c +++ b/src/tgetpass.c @@ -29,7 +29,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/ttyname.c b/src/ttyname.c index 8f642d6f4..fa1f58196 100644 --- a/src/ttyname.c +++ b/src/ttyname.c @@ -31,7 +31,6 @@ #endif #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */ diff --git a/src/utmp.c b/src/utmp.c index 8f0c8209f..0dd4de75d 100644 --- a/src/utmp.c +++ b/src/utmp.c @@ -21,7 +21,6 @@ #include #include #include -#include #ifdef HAVE_STRING_H # include #endif /* HAVE_STRING_H */