From owner-svn-src-user@FreeBSD.ORG Mon Feb 27 09:09:07 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3A99106566C; Mon, 27 Feb 2012 09:09:07 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 99C118FC12; Mon, 27 Feb 2012 09:09:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1R997Hf007686; Mon, 27 Feb 2012 09:09:07 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1R997jm007682; Mon, 27 Feb 2012 09:09:07 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201202270909.q1R997jm007682@svn.freebsd.org> From: Gabor Kovesdan Date: Mon, 27 Feb 2012 09:09:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232205 - in user/gabor/tre-integration: include lib/libc/regex X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2012 09:09:07 -0000 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;