diff options
-rw-r--r-- | include/zbxtypes.h | 10 | ||||
-rw-r--r-- | src/libs/zbxalgo/algodefs.c | 6 | ||||
-rw-r--r-- | src/libs/zbxcommon/iprange.c | 14 | ||||
-rw-r--r-- | src/libs/zbxcommon/misc.c | 6 | ||||
-rw-r--r-- | src/libs/zbxserver/evalfunc.c | 4 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/linux/hardware.c | 2 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/openbsd/sensors.c | 2 | ||||
-rw-r--r-- | src/zabbix_server/pinger/pinger.c | 8 | ||||
-rw-r--r-- | src/zabbix_server/poller/checks_ipmi.c | 2 |
9 files changed, 32 insertions, 22 deletions
diff --git a/include/zbxtypes.h b/include/zbxtypes.h index cd2cb483c4c..38cc3df2549 100644 --- a/include/zbxtypes.h +++ b/include/zbxtypes.h @@ -31,8 +31,6 @@ #define ZBX_PTR_SIZE sizeof(void *) -typedef uint32_t zbx_uint32_t; - #if defined(_WINDOWS) # include <strsafe.h> @@ -61,7 +59,11 @@ typedef uint32_t zbx_uint32_t; # define alloca _alloca -# define zbx_uint32_t __int32 +# ifndef uint32_t +typedef unsigned __int32 zbx_uint32_t; +# else +typedef uint32_t zbx_uint32_t; +# endif # ifndef PATH_SEPARATOR # define PATH_SEPARATOR '\\' @@ -127,6 +129,8 @@ typedef __int64 zbx_offset_t; # endif # endif +typedef uint32_t zbx_uint32_t; + # ifndef PATH_SEPARATOR # define PATH_SEPARATOR '/' # endif diff --git a/src/libs/zbxalgo/algodefs.c b/src/libs/zbxalgo/algodefs.c index a22b48430f4..e3edae2b964 100644 --- a/src/libs/zbxalgo/algodefs.c +++ b/src/libs/zbxalgo/algodefs.c @@ -116,14 +116,14 @@ zbx_hash_t zbx_hash_murmur2(const void *data, size_t len, zbx_hash_t seed) zbx_hash_t hash; - const zbx_uint32_t m = 0x5bd1e995u; - const zbx_uint32_t r = 24; + const zbx_hash_t m = 0x5bd1e995u; + const zbx_hash_t r = 24; hash = seed ^ len; while (len >= 4) { - zbx_uint32_t k; + zbx_hash_t k; k = p[0]; k |= p[1] << 8; diff --git a/src/libs/zbxcommon/iprange.c b/src/libs/zbxcommon/iprange.c index 0098f1e37a9..44f27cc6811 100644 --- a/src/libs/zbxcommon/iprange.c +++ b/src/libs/zbxcommon/iprange.c @@ -142,7 +142,7 @@ static int iprangev4_parse(zbx_iprange_t *iprange, const char *address) if (NULL != (end = strchr(address, '/'))) { - if (FAIL == is_uint_n_range(end + 1, len - (end + 1 - address), &bits, sizeof(int), 0, 30)) + if (FAIL == is_uint_n_range(end + 1, len - (end + 1 - address), &bits, sizeof(bits), 0, 30)) return FAIL; iprange->mask = 1; @@ -173,15 +173,21 @@ static int iprangev4_parse(zbx_iprange_t *iprange, const char *address) len = (NULL == dash ? ptr : dash) - address; /* extract the range start value */ - if (FAIL == is_uint_n_range(address, len, &iprange->range[index].from, 4, 0, 255)) + if (FAIL == is_uint_n_range(address, len, &iprange->range[index].from, + sizeof(iprange->range[index].from), 0, 255)) + { return FAIL; + } /* if range is specified, extract the end value, otherwise set end value equal to the start value */ if (NULL != dash) { dash++; - if (FAIL == is_uint_n_range(dash, ptr - dash, &iprange->range[index].to, 4, 0, 255)) + if (FAIL == is_uint_n_range(dash, ptr - dash, &iprange->range[index].to, + sizeof(iprange->range[index].to), 0, 255)) + { return FAIL; + } if (iprange->range[index].to < iprange->range[index].from) return FAIL; @@ -227,7 +233,7 @@ static int iprangev6_parse(zbx_iprange_t *iprange, const char *address) if (NULL != (end = strchr(address, '/'))) { - if (FAIL == is_uint_n_range(end + 1, len - (end + 1 - address), &bits, sizeof(int), 0, 128)) + if (FAIL == is_uint_n_range(end + 1, len - (end + 1 - address), &bits, sizeof(bits), 0, 128)) return FAIL; iprange->mask = 1; diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c index 11a17d17a29..78e16b0db32 100644 --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c @@ -762,7 +762,7 @@ static int scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char if (pend - pstart > var_len) return FAIL; - if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &start, 4, min, max)) + if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &start, sizeof(start), min, max)) return FAIL; if ('-' == *pend) @@ -780,7 +780,7 @@ static int scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char if (pend == pstart || pend - pstart > var_len) return FAIL; - if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &end, 4, min, max)) + if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &end, sizeof(end), min, max)) return FAIL; if (end < start) @@ -816,7 +816,7 @@ static int scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char if (pend == pstart || pend - pstart > var_len) return FAIL; - if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &step, 4, 1, end - start)) + if (SUCCEED != is_uint_n_range(pstart, pend - pstart, &step, sizeof(step), 1, end - start)) return FAIL; } else diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c index 5630e2ad7e3..9584bfabb60 100644 --- a/src/libs/zbxserver/evalfunc.c +++ b/src/libs/zbxserver/evalfunc.c @@ -49,10 +49,10 @@ static int __get_function_parameter_uint31(zbx_uint64_t hostid, const char *para else if ('#' == *parameter) { *flag = ZBX_FLAG_VALUES; - if (SUCCEED == is_uint31(parameter + 1, (zbx_uint32_t *)value) && 0 < *value) + if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value) ret = SUCCEED; } - else if (SUCCEED == is_uint_suffix(parameter, (unsigned int *)value) && 0 <= *value) + else if (SUCCEED == is_uint_suffix(parameter, value) && 0 <= *value) { *flag = ZBX_FLAG_SEC; ret = SUCCEED; diff --git a/src/libs/zbxsysinfo/linux/hardware.c b/src/libs/zbxsysinfo/linux/hardware.c index a5b1d6e15b3..20df220e0f3 100644 --- a/src/libs/zbxsysinfo/linux/hardware.c +++ b/src/libs/zbxsysinfo/linux/hardware.c @@ -306,7 +306,7 @@ int SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result) if (NULL == param || '\0' == *param || 0 == strcmp(param, "all")) cpu = HW_CPU_ALL_CPUS; /* show all CPUs by default */ - else if (FAIL == is_uint31(param, (zbx_uint32_t*)&cpu)) + else if (FAIL == is_uint31(param, &cpu)) { SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter.")); return SYSINFO_RET_FAIL; diff --git a/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c index c50041e2d26..24e267ead94 100644 --- a/src/libs/zbxsysinfo/openbsd/sensors.c +++ b/src/libs/zbxsysinfo/openbsd/sensors.c @@ -84,7 +84,7 @@ static int get_device_sensors(int do_task, int *mib, const struct sensordev *sen if (i == SENSOR_MAX_TYPES) return FAIL; - if (SUCCEED != is_uint31(name + len, (zbx_uint32_t*)&mib[4])) + if (SUCCEED != is_uint31(name + len, &mib[4])) return FAIL; mib[3] = i; diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index b58ea77bac1..ae63db7b8aa 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -239,7 +239,7 @@ static int parse_key_params(const char *key, const char *host_addr, icmpping_t * { *count = 3; } - else if (FAIL == is_uint31(tmp, (zbx_uint32_t*)count) || MIN_COUNT > *count || *count > MAX_COUNT) + else if (FAIL == is_uint31(tmp, count) || MIN_COUNT > *count || *count > MAX_COUNT) { zbx_snprintf(error, max_error_len, "Number of packets \"%s\" is not between %d and %d.", tmp, MIN_COUNT, MAX_COUNT); @@ -250,7 +250,7 @@ static int parse_key_params(const char *key, const char *host_addr, icmpping_t * { *interval = 0; } - else if (FAIL == is_uint31(tmp, (zbx_uint32_t*)interval) || MIN_INTERVAL > *interval) + else if (FAIL == is_uint31(tmp, interval) || MIN_INTERVAL > *interval) { zbx_snprintf(error, max_error_len, "Interval \"%s\" should be at least %d.", tmp, MIN_INTERVAL); goto out; @@ -260,7 +260,7 @@ static int parse_key_params(const char *key, const char *host_addr, icmpping_t * { *size = 0; } - else if (FAIL == is_uint31(tmp, (zbx_uint32_t*)size) || MIN_SIZE > *size || *size > MAX_SIZE) + else if (FAIL == is_uint31(tmp, size) || MIN_SIZE > *size || *size > MAX_SIZE) { zbx_snprintf(error, max_error_len, "Packet size \"%s\" is not between %d and %d.", tmp, MIN_SIZE, MAX_SIZE); @@ -271,7 +271,7 @@ static int parse_key_params(const char *key, const char *host_addr, icmpping_t * { *timeout = 0; } - else if (FAIL == is_uint31(tmp, (zbx_uint32_t*)timeout) || MIN_TIMEOUT > *timeout) + else if (FAIL == is_uint31(tmp, timeout) || MIN_TIMEOUT > *timeout) { zbx_snprintf(error, max_error_len, "Timeout \"%s\" should be at least %d.", tmp, MIN_TIMEOUT); goto out; diff --git a/src/zabbix_server/poller/checks_ipmi.c b/src/zabbix_server/poller/checks_ipmi.c index 63df523ba0b..932a50545dd 100644 --- a/src/zabbix_server/poller/checks_ipmi.c +++ b/src/zabbix_server/poller/checks_ipmi.c @@ -1363,7 +1363,7 @@ int parse_ipmi_command(const char *command, char *c_name, int *val, char *error, *val = 1; else if (0 == strcasecmp(p, "off")) *val = 0; - else if (SUCCEED != is_uint31(p, (zbx_uint32_t *)val)) + else if (SUCCEED != is_uint31(p, val)) { zbx_snprintf(error, max_error_len, "IPMI command value is not supported [%s]", p); goto fail; |