From: Todd C. Miller Date: Fri, 19 Jun 2015 03:02:57 +0000 (-0600) Subject: Remove obsolete memory.h include. X-Git-Tag: SUDO_1_8_14^2~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f9cabd005631ec3ff18a1957c3aca8a7f10fd42;p=sudo Remove obsolete memory.h include. --- diff --git a/lib/util/inet_pton.c b/lib/util/inet_pton.c index 62582c394..ba3ec6158 100644 --- a/lib/util/inet_pton.c +++ b/lib/util/inet_pton.c @@ -26,9 +26,6 @@ #include #include #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/key_val.c b/lib/util/key_val.c index ef034aa31..bd641e3cc 100644 --- a/lib/util/key_val.c +++ b/lib/util/key_val.c @@ -28,9 +28,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c index 6cda4b6d5..efe312919 100644 --- a/lib/util/lbuf.c +++ b/lib/util/lbuf.c @@ -29,9 +29,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/locking.c b/lib/util/locking.c index 23922966a..4daec57fd 100644 --- a/lib/util/locking.c +++ b/lib/util/locking.c @@ -34,9 +34,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/parseln.c b/lib/util/parseln.c index d586ff4f1..30f7d5e64 100644 --- a/lib/util/parseln.c +++ b/lib/util/parseln.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/parse_gids/parse_gids_test.c b/lib/util/regress/parse_gids/parse_gids_test.c index 5a697f01f..1ed8847c6 100644 --- a/lib/util/regress/parse_gids/parse_gids_test.c +++ b/lib/util/regress/parse_gids/parse_gids_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/progname/progname_test.c b/lib/util/regress/progname/progname_test.c index 6045fb300..95338554c 100644 --- a/lib/util/regress/progname/progname_test.c +++ b/lib/util/regress/progname/progname_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/strsplit/strsplit_test.c b/lib/util/regress/strsplit/strsplit_test.c index ad46fb263..fd2ecd16a 100644 --- a/lib/util/regress/strsplit/strsplit_test.c +++ b/lib/util/regress/strsplit/strsplit_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c index 94cf5af77..4b7cd10c4 100644 --- a/lib/util/regress/sudo_conf/conf_test.c +++ b/lib/util/regress/sudo_conf/conf_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c index 2254848fa..549ef19bd 100644 --- a/lib/util/regress/sudo_parseln/parseln_test.c +++ b/lib/util/regress/sudo_parseln/parseln_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/regress/tailq/hltq_test.c b/lib/util/regress/tailq/hltq_test.c index 7b5731fac..353370a9a 100644 --- a/lib/util/regress/tailq/hltq_test.c +++ b/lib/util/regress/tailq/hltq_test.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/sha2.c b/lib/util/sha2.c index 0a85c9742..c2b2a2a89 100644 --- a/lib/util/sha2.c +++ b/lib/util/sha2.c @@ -36,9 +36,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c index 3fcf85eca..b8c797e1c 100644 --- a/lib/util/snprintf.c +++ b/lib/util/snprintf.c @@ -69,9 +69,6 @@ #endif #include #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/strtobool.c b/lib/util/strtobool.c index 9d5fdc077..f1ac2bc5e 100644 --- a/lib/util/strtobool.c +++ b/lib/util/strtobool.c @@ -28,9 +28,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/lib/util/term.c b/lib/util/term.c index 115576226..ef775b704 100644 --- a/lib/util/term.c +++ b/lib/util/term.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/group_file/getgrent.c b/plugins/group_file/getgrent.c index f70130ee6..e8af81770 100644 --- a/plugins/group_file/getgrent.c +++ b/plugins/group_file/getgrent.c @@ -31,9 +31,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c index 9e7a2d5d7..6f1df92ea 100644 --- a/plugins/group_file/group_file.c +++ b/plugins/group_file/group_file.c @@ -34,9 +34,6 @@ # include "compat/stdbool.h" #endif /* HAVE_STDBOOL_H */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c index 32a3f5da9..75c795b43 100644 --- a/plugins/sample/sample_plugin.c +++ b/plugins/sample/sample_plugin.c @@ -35,9 +35,6 @@ # include "compat/stdbool.h" #endif /* HAVE_STDBOOL_H */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c index ed3664419..e1706fc78 100644 --- a/plugins/sudoers/boottime.c +++ b/plugins/sudoers/boottime.c @@ -34,9 +34,6 @@ # include "compat/stdbool.h" #endif /* HAVE_STDBOOL_H */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c index 8eee62d64..5a3e60475 100644 --- a/plugins/sudoers/editor.c +++ b/plugins/sudoers/editor.c @@ -28,9 +28,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/getdate.c b/plugins/sudoers/getdate.c index e0e521caa..984253629 100644 --- a/plugins/sudoers/getdate.c +++ b/plugins/sudoers/getdate.c @@ -38,9 +38,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H @@ -120,7 +117,7 @@ static int yyerror(const char *s); static int yylex(void); int yyparse(void); -#line 113 "getdate.y" +#line 110 "getdate.y" #ifndef YYSTYPE_DEFINED #define YYSTYPE_DEFINED typedef union { @@ -128,7 +125,7 @@ typedef union { enum _MERIDIAN Meridian; } YYSTYPE; #endif /* YYSTYPE_DEFINED */ -#line 131 "getdate.c" +#line 128 "getdate.c" #define tAGO 257 #define tDAY 258 #define tDAYZONE 259 @@ -396,7 +393,7 @@ short *yyss; short *yysslim; YYSTYPE *yyvs; unsigned int yystacksize; -#line 332 "getdate.y" +#line 329 "getdate.y" /* Month and day table. */ static TABLE const MonthDayTable[] = { @@ -1018,7 +1015,7 @@ main(int argc, char *argv[]) /* NOTREACHED */ } #endif /* TEST */ -#line 969 "getdate.c" +#line 966 "getdate.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || defined(__STDC__) static int yygrowstack(void) @@ -1227,37 +1224,37 @@ yyreduce: switch (yyn) { case 3: -#line 131 "getdate.y" +#line 128 "getdate.y" { yyHaveTime++; } break; case 4: -#line 134 "getdate.y" +#line 131 "getdate.y" { yyHaveZone++; } break; case 5: -#line 137 "getdate.y" +#line 134 "getdate.y" { yyHaveDate++; } break; case 6: -#line 140 "getdate.y" +#line 137 "getdate.y" { yyHaveDay++; } break; case 7: -#line 143 "getdate.y" +#line 140 "getdate.y" { yyHaveRel++; } break; case 9: -#line 149 "getdate.y" +#line 146 "getdate.y" { yyHour = yyvsp[-1].Number; yyMinutes = 0; @@ -1266,7 +1263,7 @@ case 9: } break; case 10: -#line 155 "getdate.y" +#line 152 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1275,7 +1272,7 @@ case 10: } break; case 11: -#line 161 "getdate.y" +#line 158 "getdate.y" { yyHour = yyvsp[-3].Number; yyMinutes = yyvsp[-1].Number; @@ -1285,7 +1282,7 @@ case 11: } break; case 12: -#line 168 "getdate.y" +#line 165 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1294,7 +1291,7 @@ case 12: } break; case 13: -#line 174 "getdate.y" +#line 171 "getdate.y" { yyHour = yyvsp[-5].Number; yyMinutes = yyvsp[-3].Number; @@ -1305,56 +1302,56 @@ case 13: } break; case 14: -#line 184 "getdate.y" +#line 181 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSToff; } break; case 15: -#line 188 "getdate.y" +#line 185 "getdate.y" { yyTimezone = yyvsp[0].Number; yyDSTmode = DSTon; } break; case 16: -#line 193 "getdate.y" +#line 190 "getdate.y" { yyTimezone = yyvsp[-1].Number; yyDSTmode = DSTon; } break; case 17: -#line 199 "getdate.y" +#line 196 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[0].Number; } break; case 18: -#line 203 "getdate.y" +#line 200 "getdate.y" { yyDayOrdinal = 1; yyDayNumber = yyvsp[-1].Number; } break; case 19: -#line 207 "getdate.y" +#line 204 "getdate.y" { yyDayOrdinal = yyvsp[-1].Number; yyDayNumber = yyvsp[0].Number; } break; case 20: -#line 213 "getdate.y" +#line 210 "getdate.y" { yyMonth = yyvsp[-2].Number; yyDay = yyvsp[0].Number; } break; case 21: -#line 217 "getdate.y" +#line 214 "getdate.y" { if (yyvsp[-4].Number >= 100) { yyYear = yyvsp[-4].Number; @@ -1368,7 +1365,7 @@ case 21: } break; case 22: -#line 228 "getdate.y" +#line 225 "getdate.y" { /* ISO 8601 format. yyyy-mm-dd. */ yyYear = yyvsp[-2].Number; @@ -1377,7 +1374,7 @@ case 22: } break; case 23: -#line 234 "getdate.y" +#line 231 "getdate.y" { /* e.g. 17-JUN-1992. */ yyDay = yyvsp[-2].Number; @@ -1386,14 +1383,14 @@ case 23: } break; case 24: -#line 240 "getdate.y" +#line 237 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[0].Number; } break; case 25: -#line 244 "getdate.y" +#line 241 "getdate.y" { yyMonth = yyvsp[-3].Number; yyDay = yyvsp[-2].Number; @@ -1401,14 +1398,14 @@ case 25: } break; case 26: -#line 249 "getdate.y" +#line 246 "getdate.y" { yyMonth = yyvsp[0].Number; yyDay = yyvsp[-1].Number; } break; case 27: -#line 253 "getdate.y" +#line 250 "getdate.y" { yyMonth = yyvsp[-1].Number; yyDay = yyvsp[-2].Number; @@ -1416,68 +1413,68 @@ case 27: } break; case 28: -#line 260 "getdate.y" +#line 257 "getdate.y" { yyRelSeconds = -yyRelSeconds; yyRelMonth = -yyRelMonth; } break; case 30: -#line 267 "getdate.y" +#line 264 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 31: -#line 270 "getdate.y" +#line 267 "getdate.y" { yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; } break; case 32: -#line 273 "getdate.y" +#line 270 "getdate.y" { yyRelSeconds += yyvsp[0].Number * 60L; } break; case 33: -#line 276 "getdate.y" +#line 273 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 34: -#line 279 "getdate.y" +#line 276 "getdate.y" { yyRelSeconds += yyvsp[-1].Number; } break; case 35: -#line 282 "getdate.y" +#line 279 "getdate.y" { yyRelSeconds++; } break; case 36: -#line 285 "getdate.y" +#line 282 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 37: -#line 288 "getdate.y" +#line 285 "getdate.y" { yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; } break; case 38: -#line 291 "getdate.y" +#line 288 "getdate.y" { yyRelMonth += yyvsp[0].Number; } break; case 39: -#line 296 "getdate.y" +#line 293 "getdate.y" { if (yyHaveTime && yyHaveDate && !yyHaveRel) yyYear = yyvsp[0].Number; @@ -1505,18 +1502,18 @@ case 39: } break; case 40: -#line 323 "getdate.y" +#line 320 "getdate.y" { yyval.Meridian = MER24; } break; case 41: -#line 326 "getdate.y" +#line 323 "getdate.y" { yyval.Meridian = yyvsp[0].Meridian; } break; -#line 1467 "getdate.c" +#line 1464 "getdate.c" } yyssp -= yym; yystate = *yyssp; diff --git a/plugins/sudoers/getdate.y b/plugins/sudoers/getdate.y index e9b91f377..cd32b9449 100644 --- a/plugins/sudoers/getdate.y +++ b/plugins/sudoers/getdate.y @@ -26,9 +26,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c index d8a2868bb..bb3edd732 100644 --- a/plugins/sudoers/interfaces.c +++ b/plugins/sudoers/interfaces.c @@ -28,9 +28,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c index 355bb857b..1392f30a8 100644 --- a/plugins/sudoers/iolog_path.c +++ b/plugins/sudoers/iolog_path.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c index fdc53beca..aeb4989a5 100644 --- a/plugins/sudoers/policy.c +++ b/plugins/sudoers/policy.c @@ -29,9 +29,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c index 8f65c4323..6e2e9cc3b 100644 --- a/plugins/sudoers/pwutil.c +++ b/plugins/sudoers/pwutil.c @@ -32,9 +32,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c index 511cd3e84..13fae1e6d 100644 --- a/plugins/sudoers/pwutil_impl.c +++ b/plugins/sudoers/pwutil_impl.c @@ -32,9 +32,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c index f8df34e51..792ddfe0b 100644 --- a/plugins/sudoers/regress/check_symbols/check_symbols.c +++ b/plugins/sudoers/regress/check_symbols/check_symbols.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c index dcb099d06..c24b3f95f 100644 --- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c +++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c index d2399753e..3cab4354a 100644 --- a/plugins/sudoers/regress/logging/check_wrap.c +++ b/plugins/sudoers/regress/logging/check_wrap.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/parser/check_base64.c b/plugins/sudoers/regress/parser/check_base64.c index 6eb56d2c9..d7dd3276b 100644 --- a/plugins/sudoers/regress/parser/check_base64.c +++ b/plugins/sudoers/regress/parser/check_base64.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/parser/check_digest.c b/plugins/sudoers/regress/parser/check_digest.c index 9b4b53ee1..6289fa065 100644 --- a/plugins/sudoers/regress/parser/check_digest.c +++ b/plugins/sudoers/regress/parser/check_digest.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/regress/parser/check_hexchar.c b/plugins/sudoers/regress/parser/check_hexchar.c index b5c49579a..558f36c8c 100644 --- a/plugins/sudoers/regress/parser/check_hexchar.c +++ b/plugins/sudoers/regress/parser/check_hexchar.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index f6cd6df7c..8ef7f46c9 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -38,9 +38,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c index 5ea72bc2c..054f3cd50 100644 --- a/plugins/sudoers/sudoreplay.c +++ b/plugins/sudoers/sudoreplay.c @@ -32,9 +32,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c index 1ea9accd1..e341a16eb 100644 --- a/plugins/sudoers/tsgetgrpw.c +++ b/plugins/sudoers/tsgetgrpw.c @@ -34,9 +34,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c index 4f365c0d7..270f663c5 100644 --- a/plugins/system_group/system_group.c +++ b/plugins/system_group/system_group.c @@ -34,9 +34,6 @@ # include "compat/stdbool.h" #endif /* HAVE_STDBOOL_H */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/conversation.c b/src/conversation.c index b423a0e2a..15870690f 100644 --- a/src/conversation.c +++ b/src/conversation.c @@ -31,9 +31,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/exec_pty.c b/src/exec_pty.c index 06b196f09..d6e2d53c1 100644 --- a/src/exec_pty.c +++ b/src/exec_pty.c @@ -31,9 +31,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/net_ifs.c b/src/net_ifs.c index d9a80d705..7c3285ef8 100644 --- a/src/net_ifs.c +++ b/src/net_ifs.c @@ -47,9 +47,6 @@ struct rtentry; # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/openbsd.c b/src/openbsd.c index 41fc7c8cf..6722fbd27 100644 --- a/src/openbsd.c +++ b/src/openbsd.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/preserve_fds.c b/src/preserve_fds.c index 818535f25..319010ce2 100644 --- a/src/preserve_fds.c +++ b/src/preserve_fds.c @@ -33,9 +33,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/regress/ttyname/check_ttyname.c b/src/regress/ttyname/check_ttyname.c index 674189e66..fd3b6efd8 100644 --- a/src/regress/ttyname/check_ttyname.c +++ b/src/regress/ttyname/check_ttyname.c @@ -27,9 +27,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/solaris.c b/src/solaris.c index bd3cfd7e6..7702eaaf3 100644 --- a/src/solaris.c +++ b/src/solaris.c @@ -28,9 +28,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/sudo.c b/src/sudo.c index 261ce8fc6..955c7d680 100644 --- a/src/sudo.c +++ b/src/sudo.c @@ -36,9 +36,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/tgetpass.c b/src/tgetpass.c index 369159ade..95e6b32a8 100644 --- a/src/tgetpass.c +++ b/src/tgetpass.c @@ -37,9 +37,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/ttyname.c b/src/ttyname.c index bb6fa27fd..a6bbfccbc 100644 --- a/src/ttyname.c +++ b/src/ttyname.c @@ -39,9 +39,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H diff --git a/src/utmp.c b/src/utmp.c index 053d38de2..a413f8c0f 100644 --- a/src/utmp.c +++ b/src/utmp.c @@ -29,9 +29,6 @@ # endif #endif /* STDC_HEADERS */ #ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif # include #endif /* HAVE_STRING_H */ #ifdef HAVE_STRINGS_H