diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-26 14:04:09 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-26 14:04:09 +0000 |
| commit | 05a2d7e2aa1fc17fc7011ec96a203c586f0ed2d8 (patch) | |
| tree | 1b4b62d9e79b0dccd8dd689a94b4d1121bed61bf /include/common.h | |
| parent | 3ad9ec2c7d4be13068a49fb19a1fb8f3781dd485 (diff) | |
| download | zabbix-05a2d7e2aa1fc17fc7011ec96a203c586f0ed2d8.tar.gz zabbix-05a2d7e2aa1fc17fc7011ec96a203c586f0ed2d8.tar.xz zabbix-05a2d7e2aa1fc17fc7011ec96a203c586f0ed2d8.zip | |
- [ZBX-102] Distributed monitoring: overwriting information (Sasha)
[svn merge -r4918:4921 svn://svn.zabbix.com/branches/1.4.j]
git-svn-id: svn://svn.zabbix.com/trunk@4922 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 9bd5a196..4ab855a6 100644 --- a/include/common.h +++ b/include/common.h @@ -159,7 +159,6 @@ #define MAX_BUF_LEN 65000 #define ZBX_DM_DELIMITER '\255' -#define ZBX_CKSUM_DELIMITER ',' /* Item types */ typedef enum @@ -545,7 +544,7 @@ int get_param(const char *param, int num, char *buf, int maxlen); int num_param(const char *param); int calculate_item_nextcheck(zbx_uint64_t itemid, int item_type, int delay, char *delay_flex, time_t now); int check_time_period(const char *period, time_t now); -void zbx_binary2hex(const u_char *input, int ilen, char **output, int *olen); +int zbx_binary2hex(const u_char *input, int ilen, char **output, int *olen); int zbx_hex2binary(char *io); void zbx_hex2octal(const char *input, char **output, int *olen); #ifdef HAVE_POSTGRESQL |