Minor changes.

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

2 files changed, 2 insertions, 47 deletions

diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index c9a5e01b..f7fd015b 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=
 
-libzbxsysinfo_a_SOURCES=linux/cpu.c linux/diskio.c linux/diskspace.c linux/file.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c linux/system.c linux/regexp.c linux/param.c
+libzbxsysinfo_a_SOURCES=linux/cpu.c linux/diskio.c linux/diskspace.c linux/file.c linux/inodes.c linux/memory.c linux/sensors.c  linux/swap.c  linux/uptime.c sysinfo.c linux/system.c linux/param.c 
 
 lib_LIBRARIES=libzbxsysinfo.a
-libzbxsysinfo_a_LIBADD = ../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo_a_LIBADD = ../zbxcrypto/libzbxcrypto.a ../zbxcommon/libzbxcommon.a 
diff --git a/src/libs/zbxsysinfo/linux/regexp.c b/src/libs/zbxsysinfo/linux/regexp.c
deleted file mode 100644
index ff517329..00000000
--- a/src/libs/zbxsysinfo/linux/regexp.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "config.h"
-
-#include <stdio.h>
-#include <regex.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-
-
-#define MAX_FILE_LEN	1024*1024
-
-
-char	*zbx_regexp_match(const char *string, const char *pattern, int *len)
-{
-	int	status;
-	char	*c;
-
-	regex_t	re;
-	regmatch_t match;
-
-	*len=0;
-
-
-	if (regcomp(&re, pattern, REG_EXTENDED | REG_ICASE | REG_NEWLINE) != 0)
-	{
-		return(NULL);
-	}
-
-
-	status = regexec(&re, string, (size_t) 1, &match, 0);
-
-	/* Not matched */
-	if (status != 0)
-	{
-		regfree(&re);
-		return(NULL);
-	}
-
-	c=string+match.rm_so;
-	*len=match.rm_eo - match.rm_so;
-	
-	regfree(&re);
-
-	return	c;
-}