diff options
Diffstat (limited to 'src/zabbix_server')
21 files changed, 17 insertions, 344 deletions
diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 4b53bc3d..92157b08 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "../functions.h" diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index db20de52..a1948953 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -17,32 +17,6 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" #include "cfg.h" #include "db.h" diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index bf13876a..cf96b66c 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" +#include "common.h" #include "cfg.h" #include "pid.h" @@ -25,7 +25,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "httpmacro.h" /****************************************************************************** diff --git a/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c index b7ff2ec2..baac238a 100644 --- a/src/zabbix_server/httppoller/httppoller.c +++ b/src/zabbix_server/httppoller/httppoller.c @@ -17,24 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> - -#include <string.h> - - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> -/* getopt() */ -#include <unistd.h> +#include "common.h" #include "cfg.h" #include "pid.h" @@ -42,7 +25,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "../functions.h" #include "../expression.h" #include "httptest.h" diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 08b74032..fb9eff82 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" +#include "common.h" #include "cfg.h" #include "pid.h" @@ -25,7 +25,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "../functions.h" #include "httpmacro.h" #include "httptest.h" diff --git a/src/zabbix_server/nodewatcher/events.c b/src/zabbix_server/nodewatcher/events.c index 50590909..8b30d849 100644 --- a/src/zabbix_server/nodewatcher/events.c +++ b/src/zabbix_server/nodewatcher/events.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/nodewatcher/history.c b/src/zabbix_server/nodewatcher/history.c index ab541781..1893fc3e 100644 --- a/src/zabbix_server/nodewatcher/history.c +++ b/src/zabbix_server/nodewatcher/history.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/nodewatcher/nodecomms.c b/src/zabbix_server/nodewatcher/nodecomms.c index e7fe4cd5..7f99f3cd 100644 --- a/src/zabbix_server/nodewatcher/nodecomms.c +++ b/src/zabbix_server/nodewatcher/nodecomms.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/nodewatcher/nodesender.c b/src/zabbix_server/nodewatcher/nodesender.c index a0ad4f10..b3697bea 100644 --- a/src/zabbix_server/nodewatcher/nodesender.c +++ b/src/zabbix_server/nodewatcher/nodesender.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/nodewatcher/nodewatcher.c b/src/zabbix_server/nodewatcher/nodewatcher.c index 01b5b421..b6421dac 100644 --- a/src/zabbix_server/nodewatcher/nodewatcher.c +++ b/src/zabbix_server/nodewatcher/nodewatcher.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index 3a3d82e4..798c6b9d 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -17,33 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include <sys/wait.h> - -#include <string.h> - -#ifdef HAVE_NETDB_H - #include <netdb.h> -#endif - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "../functions.h" diff --git a/src/zabbix_server/poller/checks_aggregate.h b/src/zabbix_server/poller/checks_aggregate.h index 5299b564..01b92010 100644 --- a/src/zabbix_server/poller/checks_aggregate.h +++ b/src/zabbix_server/poller/checks_aggregate.h @@ -21,7 +21,6 @@ #define ZABBIX_CHECKS_AGGREGATE_H #include "common.h" -#include "config.h" #include "db.h" #include "log.h" #include "sysinfo.h" diff --git a/src/zabbix_server/poller/checks_internal.h b/src/zabbix_server/poller/checks_internal.h index 471b9eb0..da2bdf75 100644 --- a/src/zabbix_server/poller/checks_internal.h +++ b/src/zabbix_server/poller/checks_internal.h @@ -21,7 +21,6 @@ #define ZABBIX_CHECKS_INTERNAL_H #include "common.h" -#include "config.h" #include "db.h" #include "log.h" #include "sysinfo.h" diff --git a/src/zabbix_server/poller/checks_simple.h b/src/zabbix_server/poller/checks_simple.h index 8ab0e2d4..3b327214 100644 --- a/src/zabbix_server/poller/checks_simple.h +++ b/src/zabbix_server/poller/checks_simple.h @@ -21,7 +21,6 @@ #define ZABBIX_CHECKS_SIMPLE_H #include "common.h" -#include "config.h" #include "db.h" #include "log.h" #include "sysinfo.h" diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index 47dc67e1..9b6307e8 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -17,32 +17,10 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> - -#include <string.h> - - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> -/* getopt() */ -#include <unistd.h> +#include "common.h" -#include "cfg.h" -#include "pid.h" -#include "db.h" -#include "log.h" #include "zlog.h" -#include "common.h" #include "../functions.h" #include "../expression.h" #include "poller.h" diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 14a7599e..97c57c4e 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -17,28 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> - -#include <string.h> - - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> -/* getopt() */ -#include <unistd.h> - -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> +#include "common.h" #include "cfg.h" #include "pid.h" @@ -46,7 +25,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "functions.h" #include "expression.h" #include "sysinfo.h" diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 268f4c08..25aa6a2e 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -17,23 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/stat.h> - -#include <string.h> - - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <time.h> +#include "common.h" #include "cfg.h" #include "pid.h" @@ -41,7 +25,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "timer.h" #include "../functions.h" diff --git a/src/zabbix_server/trapper/autoregister.c b/src/zabbix_server/trapper/autoregister.c index edf9f083..7cf92f53 100644 --- a/src/zabbix_server/trapper/autoregister.c +++ b/src/zabbix_server/trapper/autoregister.c @@ -17,12 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> - -#include <string.h> +#include "common.h" #include "cfg.h" #include "pid.h" @@ -30,10 +25,6 @@ #include "log.h" #include "zlog.h" -#include <sys/types.h> -#include <regex.h> - -#include "common.h" #include "autoregister.h" static void register_new_host(char *server, int host_templateid); diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index f5ab9b44..edec2236 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -17,27 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> - -#include <string.h> - - -/* Required for getpwuid */ -#include <pwd.h> - -#include <signal.h> -#include <errno.h> - -#include <sys/types.h> -#include <sys/socket.h> - -#include <time.h> -/* getopt() */ -#include <unistd.h> +#include "common.h" #include "cfg.h" #include "comms.h" @@ -46,7 +26,6 @@ #include "log.h" #include "zlog.h" -#include "common.h" #include "../functions.h" #include "../expression.h" diff --git a/src/zabbix_server/utils/nodechange.c b/src/zabbix_server/utils/nodechange.c index fc45a9ba..e63ffe27 100644 --- a/src/zabbix_server/utils/nodechange.c +++ b/src/zabbix_server/utils/nodechange.c @@ -17,19 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> - -#include <string.h> - -/* Required for getpwuid */ -#include <pwd.h> - -#include <time.h> - #include "common.h" + #include "cfg.h" #include "db.h" #include "log.h" diff --git a/src/zabbix_server/watchdog/watchdog.c b/src/zabbix_server/watchdog/watchdog.c index 1a645641..bf43d482 100644 --- a/src/zabbix_server/watchdog/watchdog.c +++ b/src/zabbix_server/watchdog/watchdog.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" +#include "common.h" #include "cfg.h" #include "db.h" @@ -27,7 +27,6 @@ #include "../alerter/alerter.h" -#include "common.h" #include "zlog.h" #include "watchdog.h" |