diff options
152 files changed, 157 insertions, 694 deletions
diff --git a/include/db.h b/include/db.h index fb2ae7e4..809464e8 100644 --- a/include/db.h +++ b/include/db.h @@ -24,7 +24,6 @@ /* time_t */ #include <time.h> -#include "config.h" #include "common.h" #include "zbxdb.h" diff --git a/include/snprintf.c b/include/snprintf.c index 271ed03d..93dad2bb 100644 --- a/include/snprintf.c +++ b/include/snprintf.c @@ -55,11 +55,7 @@ * **************************************************************/ -#ifndef NO_CONFIG_H /* for some tests */ -#include "config.h" -#else -#define NULL 0 -#endif +#include "common.h" #ifdef TEST_SNPRINTF /* need math library headers for testing */ #include <math.h> diff --git a/include/zbxdb.h b/include/zbxdb.h index 6d9ee22c..debb6a7b 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -21,7 +21,6 @@ #ifndef ZABBIX_ZBXDB_H #define ZABBIX_ZBXDB_H -#include "config.h" #include "common.h" #define ZBX_DB_OK (0) diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c index c58c524c..455e10f8 100644 --- a/src/libs/zbxcomms/comms.c +++ b/src/libs/zbxcomms/comms.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 "comms.h" #include "zbxsock.h" diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index b0631f87..2799cdce 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -17,21 +17,12 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ +#include "common.h" -#include <stdlib.h> -#include <stdio.h> - -/* for setproctitle() */ -#include <sys/types.h> -#include <unistd.h> - -#include <string.h> -#include <strings.h> - +#include "db.h" #include "zbxdb.h" #include "log.h" #include "zlog.h" -#include "common.h" #ifdef HAVE_SQLITE3 int sqlite_transaction_started = 0; @@ -163,16 +154,16 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d exit(FAIL); } sqlo_autocommit_on(oracle); + + return ret #endif #ifdef HAVE_SQLITE3 - int res; - - res = sqlite3_open(name, &conn); + ret = sqlite3_open(dbname, &conn); /* check to see that the backend connection was successfully made */ - if(res) + if(ret) { - zabbix_log(LOG_LEVEL_ERR, "Can't open database [%s]: %s\n", name, sqlite3_errmsg(conn)); + zabbix_log(LOG_LEVEL_ERR, "Can't open database [%s]: %s\n", dbname, sqlite3_errmsg(conn)); DBclose(); exit(FAIL); } @@ -180,13 +171,15 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d /* Do not return SQLITE_BUSY immediately, wait for N ms */ sqlite3_busy_timeout(conn, 60*1000); - if(ZBX_MUTEX_ERROR == php_sem_get(&sqlite_access, name)) + if(ZBX_MUTEX_ERROR == php_sem_get(&sqlite_access, dbname)) { zbx_error("Unable to create mutex for sqlite"); exit(FAIL); } sqlite_transaction_started = 0; + + return ret; #endif } @@ -550,16 +543,14 @@ DB_ROW zbx_db_fetch(DB_RESULT result) } else if(SQLO_NO_DATA == res) { - return 0; - } - else - { - zabbix_log( LOG_LEVEL_ERR, "Fetch failed:%s\n", sqlo_geterror(oracle) ); - exit(FAIL); + return NULL; } + + zabbix_log( LOG_LEVEL_ERR, "Fetch failed:%s\n", sqlo_geterror(oracle) ); + exit(FAIL); + return NULL; #endif #ifdef HAVE_SQLITE3 - int i; /* EOF */ if(!result) return NULL; diff --git a/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c index aacb713a..da5e3cd6 100644 --- a/src/libs/zbxsysinfo/aix/cpu.c +++ b/src/libs/zbxsysinfo/aix/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/aix/diskio.c b/src/libs/zbxsysinfo/aix/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/aix/diskio.c +++ b/src/libs/zbxsysinfo/aix/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/aix/diskspace.c b/src/libs/zbxsysinfo/aix/diskspace.c index d5736df6..29afcef5 100644 --- a/src/libs/zbxsysinfo/aix/diskspace.c +++ b/src/libs/zbxsysinfo/aix/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/aix/inodes.c b/src/libs/zbxsysinfo/aix/inodes.c index 82c76a4d..12a6ab49 100644 --- a/src/libs/zbxsysinfo/aix/inodes.c +++ b/src/libs/zbxsysinfo/aix/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/aix/kernel.c b/src/libs/zbxsysinfo/aix/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/aix/kernel.c +++ b/src/libs/zbxsysinfo/aix/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/aix/memory.c b/src/libs/zbxsysinfo/aix/memory.c index 9fe4d1b6..0049e875 100644 --- a/src/libs/zbxsysinfo/aix/memory.c +++ b/src/libs/zbxsysinfo/aix/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/aix/net.c b/src/libs/zbxsysinfo/aix/net.c index baf1de42..43b715c9 100644 --- a/src/libs/zbxsysinfo/aix/net.c +++ b/src/libs/zbxsysinfo/aix/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/aix/proc.c b/src/libs/zbxsysinfo/aix/proc.c index 5c4880b4..ae09f4b0 100644 --- a/src/libs/zbxsysinfo/aix/proc.c +++ b/src/libs/zbxsysinfo/aix/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/aix/sensors.c b/src/libs/zbxsysinfo/aix/sensors.c index 5d0aa7d6..683c7a7b 100644 --- a/src/libs/zbxsysinfo/aix/sensors.c +++ b/src/libs/zbxsysinfo/aix/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/aix/swap.c b/src/libs/zbxsysinfo/aix/swap.c index 31f18a76..35746a11 100644 --- a/src/libs/zbxsysinfo/aix/swap.c +++ b/src/libs/zbxsysinfo/aix/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/aix/uptime.c b/src/libs/zbxsysinfo/aix/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/aix/uptime.c +++ b/src/libs/zbxsysinfo/aix/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/freebsd/cpu.c b/src/libs/zbxsysinfo/freebsd/cpu.c index aacb713a..da5e3cd6 100644 --- a/src/libs/zbxsysinfo/freebsd/cpu.c +++ b/src/libs/zbxsysinfo/freebsd/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/freebsd/diskio.c b/src/libs/zbxsysinfo/freebsd/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/freebsd/diskio.c +++ b/src/libs/zbxsysinfo/freebsd/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/freebsd/diskspace.c b/src/libs/zbxsysinfo/freebsd/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/freebsd/diskspace.c +++ b/src/libs/zbxsysinfo/freebsd/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/freebsd/inodes.c b/src/libs/zbxsysinfo/freebsd/inodes.c index 9e6d195e..af1f6d44 100644 --- a/src/libs/zbxsysinfo/freebsd/inodes.c +++ b/src/libs/zbxsysinfo/freebsd/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/freebsd/kernel.c b/src/libs/zbxsysinfo/freebsd/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/freebsd/kernel.c +++ b/src/libs/zbxsysinfo/freebsd/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/freebsd/memory.c b/src/libs/zbxsysinfo/freebsd/memory.c index a1e08470..27d9a610 100644 --- a/src/libs/zbxsysinfo/freebsd/memory.c +++ b/src/libs/zbxsysinfo/freebsd/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/freebsd/net.c b/src/libs/zbxsysinfo/freebsd/net.c index e1086771..1925f27d 100644 --- a/src/libs/zbxsysinfo/freebsd/net.c +++ b/src/libs/zbxsysinfo/freebsd/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c index 18cc19d5..5d6e2b89 100644 --- a/src/libs/zbxsysinfo/freebsd/proc.c +++ b/src/libs/zbxsysinfo/freebsd/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/freebsd/sensors.c b/src/libs/zbxsysinfo/freebsd/sensors.c index ca1d6010..945287fd 100644 --- a/src/libs/zbxsysinfo/freebsd/sensors.c +++ b/src/libs/zbxsysinfo/freebsd/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/freebsd/swap.c b/src/libs/zbxsysinfo/freebsd/swap.c index 6fbf6d1a..8be048b6 100644 --- a/src/libs/zbxsysinfo/freebsd/swap.c +++ b/src/libs/zbxsysinfo/freebsd/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/freebsd/uptime.c b/src/libs/zbxsysinfo/freebsd/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/freebsd/uptime.c +++ b/src/libs/zbxsysinfo/freebsd/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/hpux/cpu.c b/src/libs/zbxsysinfo/hpux/cpu.c index 2a50ecff..5d298ae4 100644 --- a/src/libs/zbxsysinfo/hpux/cpu.c +++ b/src/libs/zbxsysinfo/hpux/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/hpux/diskio.c b/src/libs/zbxsysinfo/hpux/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/hpux/diskio.c +++ b/src/libs/zbxsysinfo/hpux/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/hpux/diskspace.c b/src/libs/zbxsysinfo/hpux/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/hpux/diskspace.c +++ b/src/libs/zbxsysinfo/hpux/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/hpux/inodes.c b/src/libs/zbxsysinfo/hpux/inodes.c index b4af34c1..c6cbe76f 100644 --- a/src/libs/zbxsysinfo/hpux/inodes.c +++ b/src/libs/zbxsysinfo/hpux/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/hpux/kernel.c b/src/libs/zbxsysinfo/hpux/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/hpux/kernel.c +++ b/src/libs/zbxsysinfo/hpux/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/hpux/memory.c b/src/libs/zbxsysinfo/hpux/memory.c index 9d975205..960f8bcf 100644 --- a/src/libs/zbxsysinfo/hpux/memory.c +++ b/src/libs/zbxsysinfo/hpux/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/hpux/net.c b/src/libs/zbxsysinfo/hpux/net.c index e1086771..1925f27d 100644 --- a/src/libs/zbxsysinfo/hpux/net.c +++ b/src/libs/zbxsysinfo/hpux/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/hpux/proc.c b/src/libs/zbxsysinfo/hpux/proc.c index 97318510..dd19677c 100644 --- a/src/libs/zbxsysinfo/hpux/proc.c +++ b/src/libs/zbxsysinfo/hpux/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/hpux/sensors.c b/src/libs/zbxsysinfo/hpux/sensors.c index 6c4232f2..8dc14b46 100644 --- a/src/libs/zbxsysinfo/hpux/sensors.c +++ b/src/libs/zbxsysinfo/hpux/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/hpux/swap.c b/src/libs/zbxsysinfo/hpux/swap.c index 31f18a76..35746a11 100644 --- a/src/libs/zbxsysinfo/hpux/swap.c +++ b/src/libs/zbxsysinfo/hpux/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/hpux/uptime.c b/src/libs/zbxsysinfo/hpux/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/hpux/uptime.c +++ b/src/libs/zbxsysinfo/hpux/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/linux/boottime.c b/src/libs/zbxsysinfo/linux/boottime.c index 1fff9ddb..4194b4e6 100644 --- a/src/libs/zbxsysinfo/linux/boottime.c +++ b/src/libs/zbxsysinfo/linux/boottime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int getPROC2(char *file, char *param, int fieldno, unsigned flags, int type, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c index d48b9793..0bf13ce6 100644 --- a/src/libs/zbxsysinfo/linux/cpu.c +++ b/src/libs/zbxsysinfo/linux/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/linux/diskspace.c b/src/libs/zbxsysinfo/linux/diskspace.c index a75ffa08..ddc998df 100644 --- a/src/libs/zbxsysinfo/linux/diskspace.c +++ b/src/libs/zbxsysinfo/linux/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *usage) diff --git a/src/libs/zbxsysinfo/linux/inodes.c b/src/libs/zbxsysinfo/linux/inodes.c index b5edc281..9abf6ee3 100644 --- a/src/libs/zbxsysinfo/linux/inodes.c +++ b/src/libs/zbxsysinfo/linux/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/linux/kernel.c b/src/libs/zbxsysinfo/linux/kernel.c index a63041de..7c36e42c 100644 --- a/src/libs/zbxsysinfo/linux/kernel.c +++ b/src/libs/zbxsysinfo/linux/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/linux/memory.c b/src/libs/zbxsysinfo/linux/memory.c index b95995af..a6a03531 100644 --- a/src/libs/zbxsysinfo/linux/memory.c +++ b/src/libs/zbxsysinfo/linux/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c index 7bbab486..5eaf755f 100644 --- a/src/libs/zbxsysinfo/linux/net.c +++ b/src/libs/zbxsysinfo/linux/net.c @@ -17,8 +17,6 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c index 8ec0b9de..d5fc46c9 100644 --- a/src/libs/zbxsysinfo/linux/proc.c +++ b/src/libs/zbxsysinfo/linux/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c index da51e970..27ca6c8a 100644 --- a/src/libs/zbxsysinfo/linux/sensors.c +++ b/src/libs/zbxsysinfo/linux/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/linux/swap.c b/src/libs/zbxsysinfo/linux/swap.c index f6786eb2..77ab8ac1 100644 --- a/src/libs/zbxsysinfo/linux/swap.c +++ b/src/libs/zbxsysinfo/linux/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/linux/uptime.c b/src/libs/zbxsysinfo/linux/uptime.c index 941289b2..9343c05c 100644 --- a/src/libs/zbxsysinfo/linux/uptime.c +++ b/src/libs/zbxsysinfo/linux/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/netbsd/cpu.c b/src/libs/zbxsysinfo/netbsd/cpu.c index aacb713a..da5e3cd6 100644 --- a/src/libs/zbxsysinfo/netbsd/cpu.c +++ b/src/libs/zbxsysinfo/netbsd/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/netbsd/diskio.c b/src/libs/zbxsysinfo/netbsd/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/netbsd/diskio.c +++ b/src/libs/zbxsysinfo/netbsd/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/netbsd/diskspace.c b/src/libs/zbxsysinfo/netbsd/diskspace.c index 54a781f4..e9dfd0a5 100644 --- a/src/libs/zbxsysinfo/netbsd/diskspace.c +++ b/src/libs/zbxsysinfo/netbsd/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/netbsd/inodes.c b/src/libs/zbxsysinfo/netbsd/inodes.c index 9e6d195e..af1f6d44 100644 --- a/src/libs/zbxsysinfo/netbsd/inodes.c +++ b/src/libs/zbxsysinfo/netbsd/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/netbsd/kernel.c b/src/libs/zbxsysinfo/netbsd/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/netbsd/kernel.c +++ b/src/libs/zbxsysinfo/netbsd/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/netbsd/memory.c b/src/libs/zbxsysinfo/netbsd/memory.c index 6813604d..d6f9e941 100644 --- a/src/libs/zbxsysinfo/netbsd/memory.c +++ b/src/libs/zbxsysinfo/netbsd/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/netbsd/net.c b/src/libs/zbxsysinfo/netbsd/net.c index e1086771..1925f27d 100644 --- a/src/libs/zbxsysinfo/netbsd/net.c +++ b/src/libs/zbxsysinfo/netbsd/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/netbsd/proc.c b/src/libs/zbxsysinfo/netbsd/proc.c index a702a555..081243a1 100644 --- a/src/libs/zbxsysinfo/netbsd/proc.c +++ b/src/libs/zbxsysinfo/netbsd/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/netbsd/sensors.c b/src/libs/zbxsysinfo/netbsd/sensors.c index c3dc5be1..988ad30c 100644 --- a/src/libs/zbxsysinfo/netbsd/sensors.c +++ b/src/libs/zbxsysinfo/netbsd/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/netbsd/swap.c b/src/libs/zbxsysinfo/netbsd/swap.c index 31f18a76..35746a11 100644 --- a/src/libs/zbxsysinfo/netbsd/swap.c +++ b/src/libs/zbxsysinfo/netbsd/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/netbsd/uptime.c b/src/libs/zbxsysinfo/netbsd/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/netbsd/uptime.c +++ b/src/libs/zbxsysinfo/netbsd/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/openbsd/cpu.c b/src/libs/zbxsysinfo/openbsd/cpu.c index e7da71f3..5ee58da8 100644 --- a/src/libs/zbxsysinfo/openbsd/cpu.c +++ b/src/libs/zbxsysinfo/openbsd/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int get_cpu_data(unsigned long long *idle, diff --git a/src/libs/zbxsysinfo/openbsd/diskio.c b/src/libs/zbxsysinfo/openbsd/diskio.c index ffa5b722..7a22f6d2 100644 --- a/src/libs/zbxsysinfo/openbsd/diskio.c +++ b/src/libs/zbxsysinfo/openbsd/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" /* diff --git a/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/openbsd/diskspace.c +++ b/src/libs/zbxsysinfo/openbsd/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/openbsd/inodes.c b/src/libs/zbxsysinfo/openbsd/inodes.c index fbc50fc1..f2a9993e 100644 --- a/src/libs/zbxsysinfo/openbsd/inodes.c +++ b/src/libs/zbxsysinfo/openbsd/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/openbsd/kernel.c b/src/libs/zbxsysinfo/openbsd/kernel.c index 630c025f..9b40434a 100644 --- a/src/libs/zbxsysinfo/openbsd/kernel.c +++ b/src/libs/zbxsysinfo/openbsd/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/openbsd/memory.c b/src/libs/zbxsysinfo/openbsd/memory.c index d710b029..4844dd44 100644 --- a/src/libs/zbxsysinfo/openbsd/memory.c +++ b/src/libs/zbxsysinfo/openbsd/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/openbsd/net.c b/src/libs/zbxsysinfo/openbsd/net.c index 200c3935..29608831 100644 --- a/src/libs/zbxsysinfo/openbsd/net.c +++ b/src/libs/zbxsysinfo/openbsd/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static struct nlist kernel_symbols[] = diff --git a/src/libs/zbxsysinfo/openbsd/proc.c b/src/libs/zbxsysinfo/openbsd/proc.c index 331f9fd0..794ac6d1 100644 --- a/src/libs/zbxsysinfo/openbsd/proc.c +++ b/src/libs/zbxsysinfo/openbsd/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c index 8597ca21..d0f26aff 100644 --- a/src/libs/zbxsysinfo/openbsd/sensors.c +++ b/src/libs/zbxsysinfo/openbsd/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c index 8951aa97..37c88b95 100644 --- a/src/libs/zbxsysinfo/openbsd/swap.c +++ b/src/libs/zbxsysinfo/openbsd/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/openbsd/uptime.c b/src/libs/zbxsysinfo/openbsd/uptime.c index c0491e9e..37596c2d 100644 --- a/src/libs/zbxsysinfo/openbsd/uptime.c +++ b/src/libs/zbxsysinfo/openbsd/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/cpu.c b/src/libs/zbxsysinfo/osf/cpu.c index d30f45a6..ca02e455 100644 --- a/src/libs/zbxsysinfo/osf/cpu.c +++ b/src/libs/zbxsysinfo/osf/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int SYSTEM_CPU_IDLE1(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/diskio.c b/src/libs/zbxsysinfo/osf/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/osf/diskio.c +++ b/src/libs/zbxsysinfo/osf/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/diskspace.c b/src/libs/zbxsysinfo/osf/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/osf/diskspace.c +++ b/src/libs/zbxsysinfo/osf/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/osf/inodes.c b/src/libs/zbxsysinfo/osf/inodes.c index b4af34c1..c6cbe76f 100644 --- a/src/libs/zbxsysinfo/osf/inodes.c +++ b/src/libs/zbxsysinfo/osf/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osf/kernel.c b/src/libs/zbxsysinfo/osf/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/osf/kernel.c +++ b/src/libs/zbxsysinfo/osf/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c index b1286083..6e82ab93 100644 --- a/src/libs/zbxsysinfo/osf/memory.c +++ b/src/libs/zbxsysinfo/osf/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/net.c b/src/libs/zbxsysinfo/osf/net.c index e1086771..1925f27d 100644 --- a/src/libs/zbxsysinfo/osf/net.c +++ b/src/libs/zbxsysinfo/osf/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osf/proc.c b/src/libs/zbxsysinfo/osf/proc.c index d916ec90..0e2d6424 100644 --- a/src/libs/zbxsysinfo/osf/proc.c +++ b/src/libs/zbxsysinfo/osf/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/osf/sensors.c b/src/libs/zbxsysinfo/osf/sensors.c index c3dc5be1..988ad30c 100644 --- a/src/libs/zbxsysinfo/osf/sensors.c +++ b/src/libs/zbxsysinfo/osf/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osf/swap.c b/src/libs/zbxsysinfo/osf/swap.c index feafbba0..bea54a86 100644 --- a/src/libs/zbxsysinfo/osf/swap.c +++ b/src/libs/zbxsysinfo/osf/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osf/uptime.c b/src/libs/zbxsysinfo/osf/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/osf/uptime.c +++ b/src/libs/zbxsysinfo/osf/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osx/cpu.c b/src/libs/zbxsysinfo/osx/cpu.c index aacb713a..da5e3cd6 100644 --- a/src/libs/zbxsysinfo/osx/cpu.c +++ b/src/libs/zbxsysinfo/osx/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/osx/diskio.c b/src/libs/zbxsysinfo/osx/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/osx/diskio.c +++ b/src/libs/zbxsysinfo/osx/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osx/diskspace.c b/src/libs/zbxsysinfo/osx/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/osx/diskspace.c +++ b/src/libs/zbxsysinfo/osx/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/osx/inodes.c b/src/libs/zbxsysinfo/osx/inodes.c index b4af34c1..c6cbe76f 100644 --- a/src/libs/zbxsysinfo/osx/inodes.c +++ b/src/libs/zbxsysinfo/osx/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osx/kernel.c b/src/libs/zbxsysinfo/osx/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/osx/kernel.c +++ b/src/libs/zbxsysinfo/osx/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osx/memory.c b/src/libs/zbxsysinfo/osx/memory.c index 9f42bbfc..32d9e096 100644 --- a/src/libs/zbxsysinfo/osx/memory.c +++ b/src/libs/zbxsysinfo/osx/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osx/net.c b/src/libs/zbxsysinfo/osx/net.c index e1086771..1925f27d 100644 --- a/src/libs/zbxsysinfo/osx/net.c +++ b/src/libs/zbxsysinfo/osx/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/osx/proc.c b/src/libs/zbxsysinfo/osx/proc.c index 577fc462..03af88fd 100644 --- a/src/libs/zbxsysinfo/osx/proc.c +++ b/src/libs/zbxsysinfo/osx/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/osx/sensors.c b/src/libs/zbxsysinfo/osx/sensors.c index c3dc5be1..988ad30c 100644 --- a/src/libs/zbxsysinfo/osx/sensors.c +++ b/src/libs/zbxsysinfo/osx/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osx/swap.c b/src/libs/zbxsysinfo/osx/swap.c index e5b9459b..b02b6276 100644 --- a/src/libs/zbxsysinfo/osx/swap.c +++ b/src/libs/zbxsysinfo/osx/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/osx/uptime.c b/src/libs/zbxsysinfo/osx/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/osx/uptime.c +++ b/src/libs/zbxsysinfo/osx/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/solaris/cpu.c b/src/libs/zbxsysinfo/solaris/cpu.c index 859e3771..a6474670 100644 --- a/src/libs/zbxsysinfo/solaris/cpu.c +++ b/src/libs/zbxsysinfo/solaris/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int get_cpu_data( diff --git a/src/libs/zbxsysinfo/solaris/diskio.c b/src/libs/zbxsysinfo/solaris/diskio.c index 62a33d64..fa3dc24d 100644 --- a/src/libs/zbxsysinfo/solaris/diskio.c +++ b/src/libs/zbxsysinfo/solaris/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/solaris/diskspace.c b/src/libs/zbxsysinfo/solaris/diskspace.c index 181bec40..1f8e2ca6 100644 --- a/src/libs/zbxsysinfo/solaris/diskspace.c +++ b/src/libs/zbxsysinfo/solaris/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/solaris/inodes.c b/src/libs/zbxsysinfo/solaris/inodes.c index c8fca602..604bca2d 100644 --- a/src/libs/zbxsysinfo/solaris/inodes.c +++ b/src/libs/zbxsysinfo/solaris/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/solaris/kernel.c b/src/libs/zbxsysinfo/solaris/kernel.c index 732b4e93..c5fa39b3 100644 --- a/src/libs/zbxsysinfo/solaris/kernel.c +++ b/src/libs/zbxsysinfo/solaris/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/solaris/memory.c b/src/libs/zbxsysinfo/solaris/memory.c index 56b97c58..55c7bbc1 100644 --- a/src/libs/zbxsysinfo/solaris/memory.c +++ b/src/libs/zbxsysinfo/solaris/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_FREE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); diff --git a/src/libs/zbxsysinfo/solaris/net.c b/src/libs/zbxsysinfo/solaris/net.c index 78ba13ca..286e4424 100644 --- a/src/libs/zbxsysinfo/solaris/net.c +++ b/src/libs/zbxsysinfo/solaris/net.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int get_kstat_named_field( diff --git a/src/libs/zbxsysinfo/solaris/proc.c b/src/libs/zbxsysinfo/solaris/proc.c index 822ccad0..887efa2f 100644 --- a/src/libs/zbxsysinfo/solaris/proc.c +++ b/src/libs/zbxsysinfo/solaris/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/solaris/sensors.c b/src/libs/zbxsysinfo/solaris/sensors.c index c3dc5be1..988ad30c 100644 --- a/src/libs/zbxsysinfo/solaris/sensors.c +++ b/src/libs/zbxsysinfo/solaris/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/solaris/swap.c b/src/libs/zbxsysinfo/solaris/swap.c index 3ac3ec85..1c9e08e8 100644 --- a/src/libs/zbxsysinfo/solaris/swap.c +++ b/src/libs/zbxsysinfo/solaris/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/solaris/uptime.c b/src/libs/zbxsysinfo/solaris/uptime.c index ffce14a9..c8f728a5 100644 --- a/src/libs/zbxsysinfo/solaris/uptime.c +++ b/src/libs/zbxsysinfo/solaris/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/unknown/cpu.c b/src/libs/zbxsysinfo/unknown/cpu.c index aacb713a..da5e3cd6 100644 --- a/src/libs/zbxsysinfo/unknown/cpu.c +++ b/src/libs/zbxsysinfo/unknown/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/unknown/diskio.c b/src/libs/zbxsysinfo/unknown/diskio.c index 642ac402..003d8185 100644 --- a/src/libs/zbxsysinfo/unknown/diskio.c +++ b/src/libs/zbxsysinfo/unknown/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/unknown/diskspace.c b/src/libs/zbxsysinfo/unknown/diskspace.c index f37aeb7c..be01023b 100644 --- a/src/libs/zbxsysinfo/unknown/diskspace.c +++ b/src/libs/zbxsysinfo/unknown/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int get_fs_size_stat(char *fs, double *total, double *free, double *usage) diff --git a/src/libs/zbxsysinfo/unknown/inodes.c b/src/libs/zbxsysinfo/unknown/inodes.c index b4af34c1..c6cbe76f 100644 --- a/src/libs/zbxsysinfo/unknown/inodes.c +++ b/src/libs/zbxsysinfo/unknown/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/unknown/kernel.c b/src/libs/zbxsysinfo/unknown/kernel.c index 1e297231..e06c1d5e 100644 --- a/src/libs/zbxsysinfo/unknown/kernel.c +++ b/src/libs/zbxsysinfo/unknown/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/unknown/memory.c b/src/libs/zbxsysinfo/unknown/memory.c index 60c3286f..9cdececd 100644 --- a/src/libs/zbxsysinfo/unknown/memory.c +++ b/src/libs/zbxsysinfo/unknown/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" static int VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/unknown/net.c b/src/libs/zbxsysinfo/unknown/net.c index c0b853df..996b7150 100644 --- a/src/libs/zbxsysinfo/unknown/net.c +++ b/src/libs/zbxsysinfo/unknown/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/unknown/proc.c b/src/libs/zbxsysinfo/unknown/proc.c index a702a555..081243a1 100644 --- a/src/libs/zbxsysinfo/unknown/proc.c +++ b/src/libs/zbxsysinfo/unknown/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #define DO_SUM 0 diff --git a/src/libs/zbxsysinfo/unknown/sensors.c b/src/libs/zbxsysinfo/unknown/sensors.c index da51e970..27ca6c8a 100644 --- a/src/libs/zbxsysinfo/unknown/sensors.c +++ b/src/libs/zbxsysinfo/unknown/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/unknown/swap.c b/src/libs/zbxsysinfo/unknown/swap.c index c5ac0127..450c0d68 100644 --- a/src/libs/zbxsysinfo/unknown/swap.c +++ b/src/libs/zbxsysinfo/unknown/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/unknown/uptime.c b/src/libs/zbxsysinfo/unknown/uptime.c index 3b9b7985..eb75030f 100644 --- a/src/libs/zbxsysinfo/unknown/uptime.c +++ b/src/libs/zbxsysinfo/unknown/uptime.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c index d9aebfc9..0c1b257e 100644 --- a/src/libs/zbxsysinfo/win32/cpu.c +++ b/src/libs/zbxsysinfo/win32/cpu.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "stats.h" diff --git a/src/libs/zbxsysinfo/win32/diskio.c b/src/libs/zbxsysinfo/win32/diskio.c index 9253cecc..8592a64f 100644 --- a/src/libs/zbxsysinfo/win32/diskio.c +++ b/src/libs/zbxsysinfo/win32/diskio.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/win32/diskspace.c b/src/libs/zbxsysinfo/win32/diskspace.c index 03a1252f..6c5b03d5 100644 --- a/src/libs/zbxsysinfo/win32/diskspace.c +++ b/src/libs/zbxsysinfo/win32/diskspace.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/win32/inodes.c b/src/libs/zbxsysinfo/win32/inodes.c index 47e31b40..00e66e0b 100644 --- a/src/libs/zbxsysinfo/win32/inodes.c +++ b/src/libs/zbxsysinfo/win32/inodes.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/win32/kernel.c b/src/libs/zbxsysinfo/win32/kernel.c index 23c7a7e4..f15482b0 100644 --- a/src/libs/zbxsysinfo/win32/kernel.c +++ b/src/libs/zbxsysinfo/win32/kernel.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/win32/memory.c b/src/libs/zbxsysinfo/win32/memory.c index 40872581..e40e7839 100644 --- a/src/libs/zbxsysinfo/win32/memory.c +++ b/src/libs/zbxsysinfo/win32/memory.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "symbols.h" diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c index 0b2d9ddd..7067e97e 100644 --- a/src/libs/zbxsysinfo/win32/net.c +++ b/src/libs/zbxsysinfo/win32/net.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" diff --git a/src/libs/zbxsysinfo/win32/pdhmon.c b/src/libs/zbxsysinfo/win32/pdhmon.c index 19ec6613..3a5bbd3e 100644 --- a/src/libs/zbxsysinfo/win32/pdhmon.c +++ b/src/libs/zbxsysinfo/win32/pdhmon.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "threads.h" diff --git a/src/libs/zbxsysinfo/win32/proc.c b/src/libs/zbxsysinfo/win32/proc.c index eb1a9ce9..4fec4bdc 100644 --- a/src/libs/zbxsysinfo/win32/proc.c +++ b/src/libs/zbxsysinfo/win32/proc.c @@ -17,9 +17,8 @@ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "symbols.h" diff --git a/src/libs/zbxsysinfo/win32/sensors.c b/src/libs/zbxsysinfo/win32/sensors.c index 453bf30f..235710ce 100644 --- a/src/libs/zbxsysinfo/win32/sensors.c +++ b/src/libs/zbxsysinfo/win32/sensors.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "md5.h" diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c index 51a3adab..e3c027f4 100644 --- a/src/libs/zbxsysinfo/win32/services.c +++ b/src/libs/zbxsysinfo/win32/services.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SERVICE_STATE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/win32/swap.c b/src/libs/zbxsysinfo/win32/swap.c index 5a72668d..10124408 100644 --- a/src/libs/zbxsysinfo/win32/swap.c +++ b/src/libs/zbxsysinfo/win32/swap.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" #include "symbols.h" diff --git a/src/libs/zbxsysinfo/win32/system_w32.c b/src/libs/zbxsysinfo/win32/system_w32.c index d2b9aa06..d06e79e8 100644 --- a/src/libs/zbxsysinfo/win32/system_w32.c +++ b/src/libs/zbxsysinfo/win32/system_w32.c @@ -17,9 +17,8 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" - #include "common.h" + #include "sysinfo.h" int SYSTEM_HOSTNAME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/libs/zbxsysinfo/win32/uptime.c b/src/libs/zbxsysinfo/win32/uptime.c index 40031705..247caf94 100644 --- a/src/libs/zbxsysinfo/win32/uptime.c +++ b/src/libs/zbxsysinfo/win32/uptime.c @@ -17,10 +17,9 @@ ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. **/ -#include "config.h" -#include "perfmon.h" - #include "common.h" + +#include "perfmon.h" #include "sysinfo.h" int SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c index e93a5580..786e8c59 100644 --- a/src/zabbix_get/zabbix_get.c +++ b/src/zabbix_get/zabbix_get.c @@ -17,30 +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 <netinet/in.h> -#include <netdb.h> - -#include <string.h> - -/* OpenBSD*/ -#ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> -#endif - -#include <signal.h> -#include <time.h> - -#include <errno.h> - -#include <string.h> - #include "common.h" #include "zbxsock.h" diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 6d2ae83f..7668cf3a 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -17,26 +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 <netinet/in.h> -#include <netdb.h> - -#include <string.h> - -/* OpenBSD*/ -#ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> -#endif - -#include <signal.h> -#include <time.h> - #include "common.h" #include "comms.h" #include "zbxgetopt.h" 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" |