Changes for Oracle support.

git-svn-id: svn://svn.zabbix.com/trunk@2805 97f52cf1-0a1b-0410-bd0e-c28be96e8082

20 files changed, 85 insertions, 77 deletions

diff --git a/src/libs/zbxdbhigh/action.c b/src/libs/zbxdbhigh/action.c
index 98d1bec8..0b523103 100644
--- a/src/libs/zbxdbhigh/action.c
+++ b/src/libs/zbxdbhigh/action.c
@@ -62,7 +62,7 @@ int	DBadd_action(int triggerid, int userid, int delay, char *subject, char *mess
 
 int	DBget_action_by_actionid(int actionid,DB_ACTION *action)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 1af93b79..87f0e26b 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -234,7 +234,7 @@ DB_RESULT DBselect(char *query)
 /*
  * Get value for given row and field. Must be called after DBselect.
  */ 
-char	*DBget_field(DB_RESULT *result, int rownum, int fieldnum)
+char	*DBget_field(DB_RESULT result, int rownum, int fieldnum)
 {
 #ifdef	HAVE_MYSQL
 	MYSQL_ROW	row;
@@ -317,7 +317,7 @@ long    DBaffected_rows()
 /*
  * Get number of selected records.
  */ 
-int	DBnum_rows(DB_RESULT *result)
+int	DBnum_rows(DB_RESULT result)
 {
 #ifdef	HAVE_MYSQL
 	int rows;
@@ -356,7 +356,7 @@ int	DBnum_rows(DB_RESULT *result)
  */ 
 int     DBget_function_result(double *result,char *functionid)
 {
-	DB_RESULT *dbresult;
+	DB_RESULT dbresult;
 	int		res = SUCCEED;
 
         char	sql[MAX_STRING_LEN];
@@ -392,7 +392,7 @@ int	DBget_prev_trigger_value(int triggerid)
 	int	clock;
 	int	value;
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_prev_trigger_value[%d]", triggerid);
 
@@ -447,7 +447,7 @@ static int	latest_alarm(int triggerid, int status)
 {
 	char	sql[MAX_STRING_LEN];
 	int	clock;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	int ret = FAIL;
 
 
@@ -490,7 +490,7 @@ int	latest_service_alarm(int serviceid, int status)
 {
 	char	sql[MAX_STRING_LEN];
 	int	clock;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	int ret = FAIL;
 
 
@@ -677,7 +677,7 @@ void update_triggers_status_to_unknown(int hostid,int clock,char *reason)
 	int	i;
 	char	sql[MAX_STRING_LEN];
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	DB_TRIGGER	trigger;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In update_triggers_status_to_unknown()");
@@ -714,7 +714,7 @@ void  DBdelete_services_by_triggerid(int triggerid)
 {
 	int	i, serviceid;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBdelete_services_by_triggerid(%d)", triggerid);
 	snprintf(sql,sizeof(sql)-1,"select serviceid from services where triggerid=%d", triggerid);
@@ -755,7 +755,7 @@ void  DBdelete_triggers_by_itemid(int itemid)
 {
 	int	i, triggerid;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBdelete_triggers_by_itemid(%d)", itemid);
 	snprintf(sql,sizeof(sql)-1,"select triggerid from functions where itemid=%d", itemid);
@@ -804,7 +804,7 @@ void DBdelete_sysmaps_hosts_by_hostid(int hostid)
 {
 	int	i, shostid;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBdelete_sysmaps_hosts(%d)", hostid);
 	snprintf(sql,sizeof(sql)-1,"select shostid from sysmaps_hosts where hostid=%d", hostid);
@@ -838,8 +838,8 @@ void DBupdate_triggers_status_after_restart(void)
 	int	lastchange;
 	int	now;
 
-	DB_RESULT	*result;
-	DB_RESULT	*result2;
+	DB_RESULT	result;
+	DB_RESULT	result2;
 	DB_TRIGGER	trigger;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBupdate_triggers_after_restart()");
@@ -879,7 +879,7 @@ void DBupdate_triggers_status_after_restart(void)
 
 void DBupdate_host_availability(int hostid,int available,int clock, char *error)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	char	error_esc[MAX_STRING_LEN];
 	int	disable_until;
@@ -983,7 +983,7 @@ int	DBupdate_item_status_to_notsupported(int itemid, char *error)
 
 int	DBadd_trend(int itemid, double value, int clock)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	hour;
 	int	num;
@@ -1085,7 +1085,7 @@ int	DBget_items_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_items_count()");
 
@@ -1112,7 +1112,7 @@ int	DBget_triggers_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_triggers_count()");
 
@@ -1139,7 +1139,7 @@ int	DBget_items_unsupported_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_items_unsupported_count()");
 
@@ -1166,7 +1166,7 @@ int	DBget_history_str_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_history_str_count()");
 
@@ -1193,7 +1193,7 @@ int	DBget_history_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_history_count()");
 
@@ -1220,7 +1220,7 @@ int	DBget_trends_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_trends_count()");
 
@@ -1247,7 +1247,7 @@ int	DBget_queue_count(void)
 {
 	int	res;
 	char	sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	int	now;
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In DBget_queue_count()");
@@ -1374,7 +1374,7 @@ void    DBescape_string(char *from, char *to, int maxlen)
 	to[ptr]=0;
 }
 
-void	DBget_item_from_db(DB_ITEM *item,DB_RESULT *result, int row)
+void	DBget_item_from_db(DB_ITEM *item,DB_RESULT result, int row)
 {
 	char	*s;
 	int	i;
@@ -1461,7 +1461,7 @@ void	DBget_item_from_db(DB_ITEM *item,DB_RESULT *result, int row)
 
 int     DBget_default_escalation_id()
 {
-	DB_RESULT *dbresult;
+	DB_RESULT dbresult;
 	int	res = SUCCEED;
 
         char	sql[MAX_STRING_LEN];
diff --git a/src/libs/zbxdbhigh/graph.c b/src/libs/zbxdbhigh/graph.c
index e43590bb..a494a05b 100644
--- a/src/libs/zbxdbhigh/graph.c
+++ b/src/libs/zbxdbhigh/graph.c
@@ -79,7 +79,7 @@ int	DBadd_item_to_graph(int graphid,int itemid, char *color,int drawtype, int so
 
 int	DBget_graph_item_by_gitemid(int gitemid, DB_GRAPH_ITEM *graph_item)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
@@ -109,7 +109,7 @@ int	DBget_graph_item_by_gitemid(int gitemid, DB_GRAPH_ITEM *graph_item)
 
 int	DBget_graph_by_graphid(int graphid, DB_GRAPH *graph)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
@@ -144,7 +144,8 @@ int	DBadd_graph_item_to_linked_hosts(int gitemid,int hostid)
 	DB_ITEM	item;
 	DB_GRAPH_ITEM	graph_item;
 	DB_GRAPH	graph;
-	DB_RESULT	*result,*result2;
+	DB_RESULT	result;
+	DB_RESULT	result2;
 	char	sql[MAX_STRING_LEN];
 	char	name_esc[GRAPH_NAME_LEN_MAX];
 	int	i,j;
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index 8a7630a2..2c9fc2b5 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -52,7 +52,7 @@ int	DBadd_host(char *server, int port, int status, int useip, char *ip, int disa
 
 int	DBhost_exists(char *server)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
@@ -70,7 +70,7 @@ int	DBhost_exists(char *server)
 
 int	DBadd_templates_to_host(int hostid,int host_templateid)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	i;
 
@@ -103,7 +103,7 @@ int	DBadd_template_linkage(int hostid,int templateid,int items,int triggers,int
 
 int	DBsync_host_with_templates(int hostid)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	i;
 
@@ -125,7 +125,7 @@ int	DBsync_host_with_templates(int hostid)
 
 int	DBsync_host_with_template(int hostid,int templateid,int items,int triggers,int graphs)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	i;
 
@@ -172,7 +172,7 @@ int	DBsync_host_with_template(int hostid,int templateid,int items,int triggers,i
 
 int	DBget_host_by_hostid(int hostid,DB_HOST *host)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
diff --git a/src/libs/zbxdbhigh/item.c b/src/libs/zbxdbhigh/item.c
index bfcf49f4..580f3224 100644
--- a/src/libs/zbxdbhigh/item.c
+++ b/src/libs/zbxdbhigh/item.c
@@ -31,7 +31,7 @@
 
 int	DBget_item_by_itemid(int itemid,DB_ITEM *item)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
@@ -59,7 +59,9 @@ int	DBget_item_by_itemid(int itemid,DB_ITEM *item)
 int 	DBadd_item_to_linked_hosts(int itemid, int hostid)
 {
 	DB_ITEM	item;
-	DB_RESULT	*result,*result2,*result3;
+	DB_RESULT	result;
+	DB_RESULT	result2;
+	DB_RESULT	result3;
 	char	sql[MAX_STRING_LEN];
 	int	i;
 
diff --git a/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c
index cc08bafb..907c23f1 100644
--- a/src/libs/zbxdbhigh/trigger.c
+++ b/src/libs/zbxdbhigh/trigger.c
@@ -32,7 +32,9 @@
 int	DBadd_trigger_to_linked_hosts(int triggerid,int hostid)
 {
 	DB_TRIGGER	trigger;
-	DB_RESULT	*result,*result2,*result3;
+	DB_RESULT	result;
+	DB_RESULT	result2;
+	DB_RESULT	result3;
 	char	sql[MAX_STRING_LEN];
 	char	old[MAX_STRING_LEN];
 	char	new[MAX_STRING_LEN];
@@ -169,7 +171,7 @@ int	DBadd_trigger_to_linked_hosts(int triggerid,int hostid)
  ----------------------------------------------------------------------------*/
 int	DBget_trigger_by_triggerid(int triggerid,DB_TRIGGER *trigger)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char	sql[MAX_STRING_LEN];
 	int	ret = SUCCEED;
 
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c
index dc4ddec0..db29b465 100644
--- a/src/zabbix_server/actions.c
+++ b/src/zabbix_server/actions.c
@@ -132,7 +132,7 @@ static	void	send_to_user_medias(DB_TRIGGER *trigger,DB_ACTION *action, int useri
 {
 	DB_MEDIA media;
 	char sql[MAX_STRING_LEN];
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	int	i;
 
@@ -183,7 +183,7 @@ static	void	send_to_user_medias(DB_TRIGGER *trigger,DB_ACTION *action, int useri
 static	void	send_to_user(DB_TRIGGER *trigger,DB_ACTION *action)
 {
 	char sql[MAX_STRING_LEN];
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	int	i;
 
@@ -400,7 +400,7 @@ static void run_remote_command(char* host_name, char* command)
 	
 	AGENT_RESULT	agent_result;
 	DB_ITEM         item;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	
 	char sql[MAX_STRING_LEN];
 	assert(host_name);
@@ -535,7 +535,7 @@ static int get_next_command(char** command_list, char** alias, int* is_group, ch
  ******************************************************************************/
 /*static*/	void	run_commands(DB_TRIGGER *trigger,DB_ACTION *action)
 {
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	char sql[MAX_STRING_LEN];
 	char *cmd_list = NULL;
@@ -574,7 +574,7 @@ static int get_next_command(char** command_list, char** alias, int* is_group, ch
 
 static int	check_action_condition(DB_TRIGGER *trigger,int alarmid,int new_trigger_value, DB_CONDITION *condition)
 {
-	DB_RESULT *result;
+	DB_RESULT result;
 	char sql[MAX_STRING_LEN];
 
 	int	i;
@@ -770,7 +770,7 @@ static int	check_action_condition(DB_TRIGGER *trigger,int alarmid,int new_trigge
 
 static int	check_action_conditions(DB_TRIGGER *trigger,int alarmid,int new_trigger_value, int actionid)
 {
-	DB_RESULT *result;
+	DB_RESULT result;
 	char sql[MAX_STRING_LEN];
 
 	DB_CONDITION	condition;
@@ -828,7 +828,7 @@ static int	check_action_conditions(DB_TRIGGER *trigger,int alarmid,int new_trigg
 
 void	apply_actions(DB_TRIGGER *trigger,int alarmid,int trigger_value)
 {
-	DB_RESULT *result;
+	DB_RESULT result;
 	
 	DB_ACTION action;
 
diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c
index d477b415..aa5fbc0f 100644
--- a/src/zabbix_server/alerter/alerter.c
+++ b/src/zabbix_server/alerter/alerter.c
@@ -186,7 +186,7 @@ int main_alerter_loop()
 
 	struct	sigaction phan;
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	DB_ALERT	alert;
 	DB_MEDIATYPE	mediatype;
 
diff --git a/src/zabbix_server/evalfunc.c b/src/zabbix_server/evalfunc.c
index 43b6f407..e062d5da 100644
--- a/src/zabbix_server/evalfunc.c
+++ b/src/zabbix_server/evalfunc.c
@@ -66,7 +66,7 @@
  ******************************************************************************/
 static int evaluate_LOGSOURCE(char *value, DB_ITEM *item, char *parameter)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -122,7 +122,7 @@ static int evaluate_LOGSOURCE(char *value, DB_ITEM *item, char *parameter)
  ******************************************************************************/
 static int evaluate_LOGSEVERITY(char *value, DB_ITEM *item, char *parameter)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -171,7 +171,7 @@ static int evaluate_LOGSEVERITY(char *value, DB_ITEM *item, char *parameter)
  ******************************************************************************/
 static int evaluate_COUNT(char *value, DB_ITEM *item, int parameter)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -220,7 +220,7 @@ static int evaluate_COUNT(char *value, DB_ITEM *item, int parameter)
  ******************************************************************************/
 static int evaluate_SUM(char *value, DB_ITEM *item, int parameter, int flag)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -298,7 +298,7 @@ static int evaluate_SUM(char *value, DB_ITEM *item, int parameter, int flag)
  ******************************************************************************/
 static int evaluate_AVG(char *value,DB_ITEM	*item,int parameter,int flag)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -377,7 +377,7 @@ static int evaluate_AVG(char *value,DB_ITEM	*item,int parameter,int flag)
  ******************************************************************************/
 static int evaluate_MIN(char *value,DB_ITEM	*item,int parameter, int flag)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -459,7 +459,7 @@ static int evaluate_MIN(char *value,DB_ITEM	*item,int parameter, int flag)
  ******************************************************************************/
 static int evaluate_MAX(char *value,DB_ITEM *item,int parameter,int flag)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -541,7 +541,7 @@ static int evaluate_MAX(char *value,DB_ITEM *item,int parameter,int flag)
  ******************************************************************************/
 static int evaluate_DELTA(char *value,DB_ITEM *item,int parameter, int flag)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char		sql[MAX_STRING_LEN];
 	int		now;
@@ -1057,7 +1057,7 @@ int	add_value_suffix(char *value, DB_ITEM *item)
  ******************************************************************************/
 int	replace_value_by_map(char *value, int valuemapid)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	char new_value[MAX_STRING_LEN];
 	char sql[MAX_STRING_LEN];
@@ -1108,7 +1108,7 @@ int	replace_value_by_map(char *value, int valuemapid)
 int evaluate_FUNCTION2(char *value,char *host,char *key,char *function,char *parameter)
 {
 	DB_ITEM	item;
-	DB_RESULT *result;
+	DB_RESULT result;
 
         char	sql[MAX_STRING_LEN];
 	int	res;
diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c
index b2b77809..364d8671 100644
--- a/src/zabbix_server/expression.c
+++ b/src/zabbix_server/expression.c
@@ -569,7 +569,7 @@ void	substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data
 	time_t  now;
 	struct  tm      *tm;
 
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In substitute_simple_macros [%s]",data);
 
diff --git a/src/zabbix_server/functions.c b/src/zabbix_server/functions.c
index aad597c0..f3c5af5a 100644
--- a/src/zabbix_server/functions.c
+++ b/src/zabbix_server/functions.c
@@ -70,7 +70,7 @@ extern int autoregister(char *server);
 void	update_functions(DB_ITEM *item)
 {
 	DB_FUNCTION	function;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	char		sql[MAX_STRING_LEN];
 	char		value[MAX_STRING_LEN];
 	char		value_esc[MAX_STRING_LEN];
@@ -142,7 +142,8 @@ void	update_services_rec(int serviceid)
 	int	serviceupid, algorithm;
 	time_t	now;
 
-	DB_RESULT *result,*result2;
+	DB_RESULT result;
+	DB_RESULT result2;
 
 	snprintf(sql,sizeof(sql)-1,"select l.serviceupid,s.algorithm from services_links l,services s where s.serviceid=l.serviceupid and l.servicedownid=%d",serviceid);
 	result=DBselect(sql);
@@ -231,7 +232,7 @@ void	update_services(int triggerid, int status)
 	char	sql[MAX_STRING_LEN];
 	int	i;
 
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	snprintf(sql,sizeof(sql)-1,"update services set status=%d where triggerid=%d",status,triggerid);
 	DBexecute(sql);
@@ -272,7 +273,7 @@ void	update_triggers(int itemid)
 	int	exp_value;
 	time_t	now;
 	DB_TRIGGER	trigger;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	int	i;
 
@@ -405,7 +406,7 @@ int	process_data(int sockfd,char *server,char *key,char *value,char *lastlogsize
 	char	sql[MAX_STRING_LEN];
 	AGENT_RESULT	agent;
 
-	DB_RESULT       *result;
+	DB_RESULT       result;
 	DB_ITEM	item;
 	char	*s;
 
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index 8060b520..2243ed44 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -319,7 +319,7 @@ static int housekeeping_process_log()
 	char		sql[MAX_STRING_LEN];
 	DB_HOUSEKEEPER	housekeeper;
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	int		res = SUCCEED;
 
 	int		i;
@@ -375,7 +375,7 @@ static int housekeeping_alerts(int now)
 {
 	char		sql[MAX_STRING_LEN];
 	int		alert_history;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 	int		res = SUCCEED;
 
 	zabbix_log( LOG_LEVEL_DEBUG, "In housekeeping_alerts(%d)", now);
@@ -405,7 +405,8 @@ static int housekeeping_alarms(int now)
 {
 	char		sql[MAX_STRING_LEN];
 	int		alarm_history;
-	DB_RESULT	*result, *result2;
+	DB_RESULT	result;
+	DB_RESULT	result2;
 	int 		i, alarmid;
 	int		res = SUCCEED;
 
diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c
index 306eba79..0fcdc9b7 100644
--- a/src/zabbix_server/pinger/pinger.c
+++ b/src/zabbix_server/pinger/pinger.c
@@ -124,7 +124,7 @@ static int process_value(char *key, char *host, AGENT_RESULT *value)
 {
 	char	sql[MAX_STRING_LEN];
 
-	DB_RESULT       *result;
+	DB_RESULT	result;
 	DB_ITEM	item;
 	char	*s;
 
@@ -222,7 +222,7 @@ static int create_host_file(void)
 	int	i,now;
 
 	DB_HOST	host;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log( LOG_LEVEL_DEBUG, "In create_host_file()");
 
diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c
index 9a5f369b..ac6adc58 100644
--- a/src/zabbix_server/poller/checks_aggregate.c
+++ b/src/zabbix_server/poller/checks_aggregate.c
@@ -30,9 +30,9 @@ static int	evaluate_aggregate(AGENT_RESULT *res,char *grpfunc, char *hostgroup,
 	char		sql2[MAX_STRING_LEN];
 	char		hostgroup_esc[MAX_STRING_LEN],itemkey_esc[MAX_STRING_LEN];
  
-	DB_RESULT	*result;
-	DB_RESULT	*r;
-	DB_RESULT	*result2;
+	DB_RESULT	result;
+	DB_RESULT	r;
+	DB_RESULT	result2;
 
 	int		i,valuetype,j;
 	double		d = 0, value;
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index 32976f3a..d1bfc8c3 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -109,7 +109,7 @@ static int get_minnextcheck(int now)
 {
 	char		sql[MAX_STRING_LEN];
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	int		res;
 
@@ -163,7 +163,7 @@ static void update_key_status(int hostid,int host_status)
 	AGENT_RESULT	agent;
 
 	DB_ITEM		item;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In update_key_status(%d,%d)",hostid,host_status);
 
@@ -214,7 +214,7 @@ int get_values(void)
 {
 	char		sql[MAX_STRING_LEN];
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	int		i;
 	int		now;
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 32fea743..9d3905e6 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -380,7 +380,8 @@ void	trend(void)
 {
 	char		sql[MAX_STRING_LEN];
  
-	DB_RESULT	*result,*result2;
+	DB_RESULT	result;
+	DB_RESULT	result2;
 
 	int		i,j;
 
@@ -500,7 +501,7 @@ int main(int argc, char **argv)
 	char		host[128];
 
 	char sql[MAX_STRING_LEN];
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	progname = argv[0];
 
diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c
index ce961765..d3cd271e 100644
--- a/src/zabbix_server/timer/timer.c
+++ b/src/zabbix_server/timer/timer.c
@@ -72,7 +72,7 @@ void main_timer_loop()
 
 	DB_ITEM	item;
 
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	for(;;)
 	{
diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c
index aa6ed875..779bdf9d 100644
--- a/src/zabbix_server/trapper/active.c
+++ b/src/zabbix_server/trapper/active.c
@@ -64,7 +64,7 @@ int	send_list_of_active_checks(int sockfd, char *host)
 {
 	char	sql[MAX_STRING_LEN];
 	char	s[MAX_STRING_LEN];
-	DB_RESULT *result;
+	DB_RESULT result;
 
 	int 	i;
 
diff --git a/src/zabbix_server/trapper/autoregister.c b/src/zabbix_server/trapper/autoregister.c
index 7e9a7f17..5bc823c3 100644
--- a/src/zabbix_server/trapper/autoregister.c
+++ b/src/zabbix_server/trapper/autoregister.c
@@ -40,7 +40,7 @@ static void	register_new_host(char *server, int host_templateid);
 
 int	autoregister(char *server)
 {
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	int	ret=SUCCEED;
 	char	sql[MAX_STRING_LEN];
diff --git a/src/zabbix_server/zlog.c b/src/zabbix_server/zlog.c
index 0ba82f8f..99ef20cc 100644
--- a/src/zabbix_server/zlog.c
+++ b/src/zabbix_server/zlog.c
@@ -57,7 +57,7 @@ void zabbix_syslog(const char *fmt, ...)
 	char		value_str[MAX_STRING_LEN];
 
 	DB_ITEM		item;
-	DB_RESULT	*result;
+	DB_RESULT	result;
 
 	AGENT_RESULT	agent;