diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-11 12:33:48 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-11 12:33:48 +0000 |
| commit | 79954547dab0e2a87436fba02f95ee0dbcf7a1d9 (patch) | |
| tree | 0feaed6696018fc1447c32ffe7c565f29145e3a7 /include | |
| parent | a00be6b72f85d6fe57de4fbb4dbf92c67bc6976a (diff) | |
| download | zabbix-79954547dab0e2a87436fba02f95ee0dbcf7a1d9.tar.gz zabbix-79954547dab0e2a87436fba02f95ee0dbcf7a1d9.tar.xz zabbix-79954547dab0e2a87436fba02f95ee0dbcf7a1d9.zip | |
- [DEV-137] Misc bugs and improvements
[improved processing of proxy configuration]
git-svn-id: svn://svn.zabbix.com/trunk@5892 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/db.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index d8a515c3..bfbca3aa 100644 --- a/include/common.h +++ b/include/common.h @@ -711,6 +711,10 @@ int expand_ipv6(const char *ip, char *str, size_t str_len ); double time_diff(struct timeval *from, struct timeval *to); char *zbx_age2str(int age); +int uint64_array_add(zbx_uint64_t **values, int *alloc, int *num, zbx_uint64_t value); +int uint64_array_exists(zbx_uint64_t *values, int num, zbx_uint64_t value); +void uint64_array_rm(zbx_uint64_t *values, int *num, zbx_uint64_t *rm_values, int rm_num); + int MAIN_ZABBIX_ENTRY(void); zbx_uint64_t zbx_letoh_uint64( diff --git a/include/db.h b/include/db.h index 4ad76d4f..b1366cbb 100644 --- a/include/db.h +++ b/include/db.h @@ -615,4 +615,7 @@ void DBproxy_add_history_str(zbx_uint64_t itemid, char *value, int clock); void DBproxy_add_history_text(zbx_uint64_t itemid, char *value, int clock); void DBproxy_add_history_log(zbx_uint64_t itemid, char *value, int clock, int timestamp, char *source, int severity, int lastlogsize); + +void DBadd_condition_alloc(char **sql, int *sql_alloc, int *sql_offset, const char *fieldname, const zbx_uint64_t *values, const int num); + #endif |