From 5ec417e35ec1eb0b1b0ed055157177d9a2163d61 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 30 Sep 2014 09:39:48 -0400 Subject: [PATCH] continuing war on unnecessary include of sys/time.h --- citadel/citserver.c | 14 +----- citadel/genstamp.c | 13 +---- citadel/include/ctdl_module.h | 13 +---- citadel/internet_addressing.c | 13 +---- citadel/parsedate.c | 87 +++++++++++++++------------------- citadel/parsedate.y | 13 +---- citadel/utillib/citadel_dirs.c | 17 +------ citadel/utils/msgform.c | 17 ++----- citadel/utils/stress.c | 11 +---- 9 files changed, 50 insertions(+), 148 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index e5029fe51..ace58c5e7 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2014 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 3. @@ -14,17 +14,7 @@ #include #include "sysdep.h" -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #if HAVE_BACKTRACE #include #endif diff --git a/citadel/genstamp.c b/citadel/genstamp.c index 9c5ba5f3d..668e8c052 100644 --- a/citadel/genstamp.c +++ b/citadel/genstamp.c @@ -7,18 +7,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include "genstamp.h" diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h index 2b62fc89b..7005c1c38 100644 --- a/citadel/include/ctdl_module.h +++ b/citadel/include/ctdl_module.h @@ -26,18 +26,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include #ifdef HAVE_STRINGS_H diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 83fcf4c04..362d6ccf3 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -13,18 +13,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include #include diff --git a/citadel/parsedate.c b/citadel/parsedate.c index 74cf35563..854402077 100644 --- a/citadel/parsedate.c +++ b/citadel/parsedate.c @@ -94,18 +94,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #if HAVE_STRING_H # if !STDC_HEADERS && HAVE_MEMORY_H # include @@ -192,7 +181,7 @@ static void date_error(char *); /* Line 268 of yacc.c */ -#line 196 "y.tab.c" +#line 185 "y.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -249,7 +238,7 @@ typedef union YYSTYPE { /* Line 293 of yacc.c */ -#line 125 "parsedate.y" +#line 114 "parsedate.y" time_t Number; enum _MERIDIAN Meridian; @@ -257,7 +246,7 @@ typedef union YYSTYPE /* Line 293 of yacc.c */ -#line 261 "y.tab.c" +#line 250 "y.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -269,7 +258,7 @@ typedef union YYSTYPE /* Line 343 of yacc.c */ -#line 273 "y.tab.c" +#line 262 "y.tab.c" #ifdef short # undef short @@ -567,10 +556,10 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 139, 139, 140, 143, 152, 156, 159, 164, 176, - 182, 189, 195, 205, 209, 213, 221, 227, 248, 252, - 264, 268, 273, 277, 282, 289, 292, 295, 298, 303, - 306 + 0, 128, 128, 129, 132, 141, 145, 148, 153, 165, + 171, 178, 184, 194, 198, 202, 210, 216, 237, 241, + 253, 257, 262, 266, 271, 278, 281, 284, 287, 292, + 295 }; #endif @@ -1523,7 +1512,7 @@ yyreduce: case 4: /* Line 1806 of yacc.c */ -#line 143 "parsedate.y" +#line 132 "parsedate.y" { yyHaveTime++; #ifdef lint @@ -1538,7 +1527,7 @@ yyreduce: case 5: /* Line 1806 of yacc.c */ -#line 152 "parsedate.y" +#line 141 "parsedate.y" { yyHaveTime++; yyTimezone = (yyvsp[(2) - (2)].Number); @@ -1548,7 +1537,7 @@ yyreduce: case 6: /* Line 1806 of yacc.c */ -#line 156 "parsedate.y" +#line 145 "parsedate.y" { yyHaveDate++; } @@ -1557,7 +1546,7 @@ yyreduce: case 7: /* Line 1806 of yacc.c */ -#line 159 "parsedate.y" +#line 148 "parsedate.y" { yyHaveRel = 1; } @@ -1566,7 +1555,7 @@ yyreduce: case 8: /* Line 1806 of yacc.c */ -#line 164 "parsedate.y" +#line 153 "parsedate.y" { if ((yyvsp[(1) - (2)].Number) < 100) { yyHour = (yyvsp[(1) - (2)].Number); @@ -1584,7 +1573,7 @@ yyreduce: case 9: /* Line 1806 of yacc.c */ -#line 176 "parsedate.y" +#line 165 "parsedate.y" { yyHour = (yyvsp[(1) - (4)].Number); yyMinutes = (yyvsp[(3) - (4)].Number); @@ -1596,7 +1585,7 @@ yyreduce: case 10: /* Line 1806 of yacc.c */ -#line 182 "parsedate.y" +#line 171 "parsedate.y" { yyHour = (yyvsp[(1) - (4)].Number); yyMinutes = (yyvsp[(3) - (4)].Number); @@ -1609,7 +1598,7 @@ yyreduce: case 11: /* Line 1806 of yacc.c */ -#line 189 "parsedate.y" +#line 178 "parsedate.y" { yyHour = (yyvsp[(1) - (6)].Number); yyMinutes = (yyvsp[(3) - (6)].Number); @@ -1621,7 +1610,7 @@ yyreduce: case 12: /* Line 1806 of yacc.c */ -#line 195 "parsedate.y" +#line 184 "parsedate.y" { yyHour = (yyvsp[(1) - (6)].Number); yyMinutes = (yyvsp[(3) - (6)].Number); @@ -1635,7 +1624,7 @@ yyreduce: case 13: /* Line 1806 of yacc.c */ -#line 205 "parsedate.y" +#line 194 "parsedate.y" { (yyval.Number) = (yyvsp[(1) - (1)].Number); yyDSTmode = DSToff; @@ -1645,7 +1634,7 @@ yyreduce: case 14: /* Line 1806 of yacc.c */ -#line 209 "parsedate.y" +#line 198 "parsedate.y" { (yyval.Number) = (yyvsp[(1) - (1)].Number); yyDSTmode = DSTon; @@ -1655,7 +1644,7 @@ yyreduce: case 15: /* Line 1806 of yacc.c */ -#line 213 "parsedate.y" +#line 202 "parsedate.y" { /* Only allow "GMT+300" and "GMT-0800" */ if ((yyvsp[(1) - (2)].Number) != 0) { @@ -1669,7 +1658,7 @@ yyreduce: case 16: /* Line 1806 of yacc.c */ -#line 221 "parsedate.y" +#line 210 "parsedate.y" { (yyval.Number) = (yyvsp[(1) - (1)].Number); yyDSTmode = DSToff; @@ -1679,7 +1668,7 @@ yyreduce: case 17: /* Line 1806 of yacc.c */ -#line 227 "parsedate.y" +#line 216 "parsedate.y" { int i; @@ -1704,7 +1693,7 @@ yyreduce: case 18: /* Line 1806 of yacc.c */ -#line 248 "parsedate.y" +#line 237 "parsedate.y" { yyMonth = (yyvsp[(1) - (3)].Number); yyDay = (yyvsp[(3) - (3)].Number); @@ -1714,7 +1703,7 @@ yyreduce: case 19: /* Line 1806 of yacc.c */ -#line 252 "parsedate.y" +#line 241 "parsedate.y" { if ((yyvsp[(1) - (5)].Number) > 100) { yyYear = (yyvsp[(1) - (5)].Number); @@ -1732,7 +1721,7 @@ yyreduce: case 20: /* Line 1806 of yacc.c */ -#line 264 "parsedate.y" +#line 253 "parsedate.y" { yyMonth = (yyvsp[(1) - (2)].Number); yyDay = (yyvsp[(2) - (2)].Number); @@ -1742,7 +1731,7 @@ yyreduce: case 21: /* Line 1806 of yacc.c */ -#line 268 "parsedate.y" +#line 257 "parsedate.y" { yyMonth = (yyvsp[(1) - (4)].Number); yyDay = (yyvsp[(2) - (4)].Number); @@ -1753,7 +1742,7 @@ yyreduce: case 22: /* Line 1806 of yacc.c */ -#line 273 "parsedate.y" +#line 262 "parsedate.y" { yyDay = (yyvsp[(1) - (2)].Number); yyMonth = (yyvsp[(2) - (2)].Number); @@ -1763,7 +1752,7 @@ yyreduce: case 23: /* Line 1806 of yacc.c */ -#line 277 "parsedate.y" +#line 266 "parsedate.y" { yyDay = (yyvsp[(1) - (3)].Number); yyMonth = (yyvsp[(2) - (3)].Number); @@ -1774,7 +1763,7 @@ yyreduce: case 24: /* Line 1806 of yacc.c */ -#line 282 "parsedate.y" +#line 271 "parsedate.y" { yyDay = (yyvsp[(3) - (5)].Number); yyMonth = (yyvsp[(4) - (5)].Number); @@ -1785,7 +1774,7 @@ yyreduce: case 25: /* Line 1806 of yacc.c */ -#line 289 "parsedate.y" +#line 278 "parsedate.y" { yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); } @@ -1794,7 +1783,7 @@ yyreduce: case 26: /* Line 1806 of yacc.c */ -#line 292 "parsedate.y" +#line 281 "parsedate.y" { yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); } @@ -1803,7 +1792,7 @@ yyreduce: case 27: /* Line 1806 of yacc.c */ -#line 295 "parsedate.y" +#line 284 "parsedate.y" { yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); } @@ -1812,7 +1801,7 @@ yyreduce: case 28: /* Line 1806 of yacc.c */ -#line 298 "parsedate.y" +#line 287 "parsedate.y" { yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); } @@ -1821,7 +1810,7 @@ yyreduce: case 29: /* Line 1806 of yacc.c */ -#line 303 "parsedate.y" +#line 292 "parsedate.y" { (yyval.Meridian) = MER24; } @@ -1830,7 +1819,7 @@ yyreduce: case 30: /* Line 1806 of yacc.c */ -#line 306 "parsedate.y" +#line 295 "parsedate.y" { (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian); } @@ -1839,7 +1828,7 @@ yyreduce: /* Line 1806 of yacc.c */ -#line 1843 "y.tab.c" +#line 1832 "y.tab.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2070,7 +2059,7 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 311 "parsedate.y" +#line 300 "parsedate.y" /* Month and day table. */ diff --git a/citadel/parsedate.y b/citadel/parsedate.y index 3166f3106..d6022d365 100644 --- a/citadel/parsedate.y +++ b/citadel/parsedate.y @@ -25,18 +25,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #if HAVE_STRING_H # if !STDC_HEADERS && HAVE_MEMORY_H # include diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c index ff6247074..17115df40 100644 --- a/citadel/utillib/citadel_dirs.c +++ b/citadel/utillib/citadel_dirs.c @@ -1,7 +1,7 @@ /* * citadel_dirs.c : calculate pathnames for various files used in the Citadel system * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2014 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -17,22 +17,9 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include - - #include "citadel.h" /* our directories... */ diff --git a/citadel/utils/msgform.c b/citadel/utils/msgform.c index 201745a03..909e6b8ed 100644 --- a/citadel/utils/msgform.c +++ b/citadel/utils/msgform.c @@ -16,18 +16,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include @@ -53,7 +42,7 @@ char *strerror(int e) int main(int argc, char **argv) { struct tm tm; - int a, b, e, mtype, aflag; + int a, b, e, aflag; char bbb[1024]; char subject[1024]; FILE *fp; @@ -79,7 +68,7 @@ TOP: do { exit(0); } while (e != 255); strcpy(subject, ""); - mtype = getc(fp); + getc(fp); aflag = getc(fp); if (qwk == 0) printf(" "); diff --git a/citadel/utils/stress.c b/citadel/utils/stress.c index 9c6d1b24d..2655b11c9 100644 --- a/citadel/utils/stress.c +++ b/citadel/utils/stress.c @@ -68,16 +68,7 @@ char* const message = #include #include #include "sysdep.h" -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif +#include #include "citadel_ipc.h" #ifndef HAVE_PTHREAD_H -- 2.30.2