From owner-svn-src-user@FreeBSD.ORG Sat Feb 18 20:17:17 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 6C8291065672; Sat, 18 Feb 2012 20:17:17 +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 3EBE48FC08; Sat, 18 Feb 2012 20:17:17 +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 q1IKHHew046434; Sat, 18 Feb 2012 20:17:17 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1IKHHTj046430; Sat, 18 Feb 2012 20:17:17 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201202182017.q1IKHHTj046430@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 18 Feb 2012 20:17:17 +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: r231898 - user/gabor/tre-integration/contrib/tre/lib 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: Sat, 18 Feb 2012 20:17:17 -0000 Author: gabor Date: Sat Feb 18 20:17:16 2012 New Revision: 231898 URL: http://svn.freebsd.org/changeset/base/231898 Log: - Change paramter order of tre_wmexec - Add prototypes to the header file Modified: user/gabor/tre-integration/contrib/tre/lib/mregexec.c user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.h Modified: user/gabor/tre-integration/contrib/tre/lib/mregexec.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/mregexec.c Sat Feb 18 19:37:02 2012 (r231897) +++ user/gabor/tre-integration/contrib/tre/lib/mregexec.c Sat Feb 18 20:17:16 2012 (r231898) @@ -198,8 +198,8 @@ finish: while (st < len) { /* Look for a possible match. */ - ret = tre_wmexec(INPUT(st), len, type, 1, &rpm, - eflags, preg->wm); + ret = tre_wmexec(preg->wm, INPUT(st), len, type, 1, &rpm, + eflags); if (ret != REG_OK) goto finish; @@ -255,7 +255,7 @@ finish: */ else if (preg->type == MHEUR_LITERAL) { - return tre_wmexec(str, len, type, nmatch, pmatch, eflags, preg->wm); + return tre_wmexec(preg->wm, str, len, type, nmatch, pmatch, eflags); } /* @@ -277,7 +277,7 @@ finish: while (st < len) { - ret = tre_wmexec(INPUT(st), len, type, nmatch, &rpm, eflags, preg->wm); + ret = tre_wmexec(preg->wm, INPUT(st), len, type, nmatch, &rpm, eflags); if (ret != REG_OK) return ret; Modified: user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c Sat Feb 18 19:37:02 2012 (r231897) +++ user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.c Sat Feb 18 20:17:16 2012 (r231898) @@ -293,9 +293,9 @@ fail: wm->wdefsh) int -tre_wmexec(const void *str, size_t len, tre_str_type_t type, - size_t nmatch, regmatch_t pmatch[], int eflags, - const wmsearch_t *wm) +tre_wmexec(const wmsearch_t *wm, const void *str, size_t len, + tre_str_type_t type, size_t nmatch, regmatch_t pmatch[], + int eflags) { wmentry_t *s_entry, *p_entry; tre_char_t *wide_str = str; Modified: user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.h Sat Feb 18 19:37:02 2012 (r231897) +++ user/gabor/tre-integration/contrib/tre/lib/tre-mfastmatch.h Sat Feb 18 20:17:16 2012 (r231898) @@ -40,4 +40,14 @@ typedef struct { uint8_t pref_list[WM_MAXPAT]; /* Pats starting w/ fragment */ } wmentry_t; +int +tre_wmcomp(wmsearch_t *wm, size_t nr, const tre_char_t *regex[], + size_t n[], int cflags); +int +tre_wmexec(const wmsearch_t *wm, const void *str, size_t len, + tre_str_type_t type, size_t nmatch, regmatch_t pmatch[], + int eflags); +void +tre_wmfree(wmsearch_t *wm); + #endif /* TRE_MFASTMATCH_H */