Minor changes.

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

3 files changed, 21 insertions, 24 deletions

diff --git a/src/libs/zbxdbhigh/Makefile.am b/src/libs/zbxdbhigh/Makefile.am
index fe487d6f..256c29a2 100644
--- a/src/libs/zbxdbhigh/Makefile.am
+++ b/src/libs/zbxdbhigh/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS=
 INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @PGSQL_INCLUDE@
 lib_LIBRARIES=libzbxdbhigh.a
-libzbxdbhigh_a_SOURCES=db.c host.c
+libzbxdbhigh_a_SOURCES=host.c db.c
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index 61485c81..42cf6d07 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -21,10 +21,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-/* for setproctitle() */
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <string.h>
 #include <strings.h>
 
@@ -53,3 +49,21 @@ int	DBadd_new_host(char *server, int port, int status, int useip, char *ip, int
 
 	return hostid;
 }
+
+int	DBhost_exists(char *server)
+{
+	DB_RESULT	*result;
+	char	sql[MAX_STRING_LEN];
+	int	ret = SUCCEED;
+
+	snprintf(sql,sizeof(sql)-1,"select hostid from hosts order where host='%s'", server);
+	result = DBselect(sql);
+
+	if(DBnum_rows(result) == 0)
+	{
+		ret = FAIL;
+	}
+	DBfree_result(result);
+
+	return ret;
+}
diff --git a/src/zabbix_server/trapper/autoregister.c b/src/zabbix_server/trapper/autoregister.c
index 91b57b9b..989dea75 100644
--- a/src/zabbix_server/trapper/autoregister.c
+++ b/src/zabbix_server/trapper/autoregister.c
@@ -35,23 +35,6 @@
 
 #include "common.h"
 
-int	host_exists(char *server)
-{
-	DB_RESULT	*result;
-	char	sql[MAX_STRING_LEN];
-	int	ret = SUCCEED;
-
-	snprintf(sql,sizeof(sql)-1,"select hostid from hosts order where host='%s'", server);
-	result = DBselect(sql);
-
-	if(DBnum_rows(result) == 0)
-	{
-		ret = FAIL;
-	}
-	DBfree_result(result);
-
-	return ret;
-}
 
 int	autoregister(char *server)
 {
@@ -66,7 +49,7 @@ int	autoregister(char *server)
 	
 	zabbix_log( LOG_LEVEL_WARNING, "In autoregister(%s)",server);
 
-	if(host_exists(server) == SUCCEED)
+	if(DBhost_exists(server) == SUCCEED)
 	{
 		zabbix_log( LOG_LEVEL_WARNING, "Host [%d] already exists. Do nothing.", server);
 		return FAIL;
@@ -98,7 +81,7 @@ int	autoregister(char *server)
 	return ret;
 }
 
-static	void	register_new_host(char *server, int hostid)
+void	register_new_host(char *server, int hostid)
 {
 	int	id;