diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-09-28 09:25:52 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-09-28 09:25:52 +0000 |
| commit | 3ec335dc8f1eab0339b46ba9b9f17c77d92dcaa2 (patch) | |
| tree | 7d1c368ff6f823ae3a8ddbd535d577a3fcf747ba /include | |
| parent | 430acc28a32cd449a53310c992b8ae97f1734f88 (diff) | |
- [ZBX-67] Under DM, Synchronizing binary data between nodes for PostgresSQL (Sasha)
[svn merge svn://svn.zabbix.com/branches/1.4 -r4802:4805]
git-svn-id: svn://svn.zabbix.com/trunk@4806 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 9 | ||||
| -rw-r--r-- | include/zbxdb.h | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 9bf96f70..31c91e21 100644 --- a/include/common.h +++ b/include/common.h @@ -536,9 +536,14 @@ 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, size_t ilen, char **output, size_t *olen); +void zbx_binary2hex(const u_char *input, int ilen, char **output, int *olen); int zbx_hex2binary(char *io); -char *zbx_get_next_field(const char *line, char **output, size_t *olen, char separator); +void zbx_hex2octal(const char *input, char **output, int *olen); +#ifdef HAVE_POSTGRESQL +void zbx_pg_escape_bytea(const u_char *input, int ilen, char **output, int *olen); +int zbx_pg_unescape_bytea(u_char *io); +#endif +char *zbx_get_next_field(const char *line, char **output, int *olen, char separator); #ifdef HAVE___VA_ARGS__ # define zbx_setproctitle(fmt, ...) __zbx_zbx_setproctitle(ZBX_CONST_STRING(fmt), ##__VA_ARGS__) diff --git a/include/zbxdb.h b/include/zbxdb.h index f6afda79..939fc76d 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -101,6 +101,7 @@ void SQ_DBfree_result(DB_RESULT result); DB_ROW values; } ZBX_PG_DB_RESULT; +extern int ZBX_PG_BYTEAOID; void PG_DBfree_result(DB_RESULT result); #endif |