svn commit: r232205 - in user/gabor/tre-integration: include lib/libc/regex

[Gabor Kovesdan]

Author: gabor
Date: Mon Feb 27 09:09:07 2012
New Revision: 232205
URL: http://svn.freebsd.org/changeset/base/232205

Log:
  - Properly add mregerror()

Modified:
  user/gabor/tre-integration/include/mregex.h
  user/gabor/tre-integration/lib/libc/regex/Makefile.inc
  user/gabor/tre-integration/lib/libc/regex/Symbol.map

Modified: user/gabor/tre-integration/include/mregex.h
==============================================================================
--- user/gabor/tre-integration/include/mregex.h	Mon Feb 27 08:57:02 2012	(r232204)
+++ user/gabor/tre-integration/include/mregex.h	Mon Feb 27 09:09:07 2012	(r232205)
@@ -10,6 +10,7 @@
 #define tre_mregncomp	mregncomp
 #define tre_mregcomp	mregcomp
 #define tre_mregnexec	mregnexec
+#define tre_mregerror	mregerror
 #define tre_mregexec	mregexec
 #define tre_mregfree	mregfree
 #define tre_mregwncomp	mregwncomp
@@ -24,6 +25,7 @@
 #define mregncomp	tre_mregncomp
 #define mregcomp	tre_mregcomp
 #define mregnexec	tre_mregnexec
+#define mregerror	tre_mregerror
 #define mregexec	tre_mregexec
 #define mregfree	tre_mregfree
 #define mregwncomp	tre_mregwncomp
@@ -58,8 +60,8 @@ FUNC_DECL(mregexec)(const mregex_t *preg
 void
 FUNC_DECL(mregfree)(mregex_t *preg);
 size_t
-FUNC_DECL(tre_mregerror)(int errcode, const mregex_t *preg,
-			 int *errpatn, char *errbuf, size_t errbuf_size);
+FUNC_DECL(mregerror)(int errcode, const mregex_t *preg,
+		     int *errpatn, char *errbuf, size_t errbuf_size);
 #ifdef TRE_WCHAR
 int
 FUNC_DECL(mregwncomp)(mregex_t *preg, size_t nr, const wchar_t **regex,

Modified: user/gabor/tre-integration/lib/libc/regex/Makefile.inc
==============================================================================
--- user/gabor/tre-integration/lib/libc/regex/Makefile.inc	Mon Feb 27 08:57:02 2012	(r232204)
+++ user/gabor/tre-integration/lib/libc/regex/Makefile.inc	Mon Feb 27 09:09:07 2012	(r232205)
@@ -5,8 +5,8 @@
 
 CFLAGS+=-DHAVE_CONFIG_H -DTRE_LIBC_BUILD -I${.CURDIR}/../../contrib/tre
 
-SRCS+=	hashtable.c mregcomp.c mregexec.c regcomp.c regerror.c regexec.c \
-	tre-ast.c tre-compile.c tre-fastmatch.c tre-heuristic.c \
+SRCS+=	hashtable.c mregcomp.c mregerror.c mregexec.c regcomp.c regerror.c \
+	regexec.c tre-ast.c tre-compile.c tre-fastmatch.c tre-heuristic.c \
 	tre-match-approx.c tre-match-backtrack.c tre-match-parallel.c \
 	tre-mfastmatch.c tre-mem.c tre-parse.c tre-stack.c xmalloc.c
 

Modified: user/gabor/tre-integration/lib/libc/regex/Symbol.map
==============================================================================
--- user/gabor/tre-integration/lib/libc/regex/Symbol.map	Mon Feb 27 08:57:02 2012	(r232204)
+++ user/gabor/tre-integration/lib/libc/regex/Symbol.map	Mon Feb 27 09:09:07 2012	(r232205)
@@ -37,6 +37,7 @@ FBSDprivate_1.0 {
 	tre_mregncomp;
 	tre_mregnexec;
 	tre_mregcomp;
+	tre_mregerror;
 	tre_mregexec;
 	tre_mregfree;
 	tre_mregwcomp;