summaryrefslogtreecommitdiffstats
path: root/src/libs/zbxdbhigh/db.c
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-25 19:33:10 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-25 19:33:10 +0000
commitde49e4b5391f659a81d75c97b57b13cb2f1c97a5 (patch)
tree2576db4247dd3b741c78cfcee5e7058b57d8aa78 /src/libs/zbxdbhigh/db.c
parent560f33b5a6f5325b85427c7b7ca3ebbbe5fde312 (diff)
downloadzabbix-de49e4b5391f659a81d75c97b57b13cb2f1c97a5.tar.gz
zabbix-de49e4b5391f659a81d75c97b57b13cb2f1c97a5.tar.xz
zabbix-de49e4b5391f659a81d75c97b57b13cb2f1c97a5.zip
- [DEV-120] C library for SQLite3 updates
[svn merge svn://svn.zabbix.com/branches/1.4 -r5399:5401] git-svn-id: svn://svn.zabbix.com/trunk@5402 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxdbhigh/db.c')
-rw-r--r--src/libs/zbxdbhigh/db.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index a326b80e..c00f20ff 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -1609,7 +1609,7 @@ void DBvacuum(void)
void DBescape_string(const char *str, char *to, int maxlen)
{ /* NOTE: sync changes with 'DBdyn_escape_string' */
register int i=0, ptr=0;
-#ifdef HAVE_ORACLE
+#if defined(HAVE_ORACLE) || defined(HAVE_SQLITE3)
# define ZBX_DB_ESC_CH '\''
#else /* not HAVE_ORACLE */
# define ZBX_DB_ESC_CH '\\'
@@ -1622,7 +1622,7 @@ void DBescape_string(const char *str, char *to, int maxlen)
if( str[i] == '\r' ) continue;
if( ( str[i] == '\'' )
-#ifndef HAVE_ORACLE
+#if !defined(HAVE_ORACLE) && !defined(HAVE_SQLITE3)
|| ( str[i] == '\\' )
#endif /* not HAVE_ORACLE */
)