From owner-svn-src-user@FreeBSD.ORG Sat Sep 17 05:36:00 2011 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 85382106564A; Sat, 17 Sep 2011 05:36:00 +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 32B7F8FC0A; Sat, 17 Sep 2011 05:36:00 +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 p8H5a0Hf054265; Sat, 17 Sep 2011 05:36:00 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8H5a0xY054262; Sat, 17 Sep 2011 05:36:00 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201109170536.p8H5a0xY054262@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 17 Sep 2011 05:36:00 +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: r225634 - 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, 17 Sep 2011 05:36:00 -0000 Author: gabor Date: Sat Sep 17 05:35:59 2011 New Revision: 225634 URL: http://svn.freebsd.org/changeset/base/225634 Log: - Portability fix for format strings Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c Sat Sep 17 04:31:43 2011 (r225633) +++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c Sat Sep 17 05:35:59 2011 (r225634) @@ -156,7 +156,7 @@ static int fastcmp(const void *, const b gs = fg->bmGs[mismatch]; \ } \ bc = (r == HASH_OK) ? bc : fg->defBc; \ - DPRINT(("tre_fast_match: mismatch on character %lc, " \ + DPRINT(("tre_fast_match: mismatch on character" CHF ", " \ "BC %d, GS %d\n", \ ((const tre_char_t *)startptr)[mismatch + 1], \ bc, gs)); \ @@ -299,7 +299,7 @@ static int fastcmp(const void *, const b r = hashtable_put(fg->qsBc_table, &fg->wpattern[i], &k); \ if ((r == HASH_FAIL) || (r == HASH_FULL)) \ FAIL_COMP(REG_ESPACE); \ - DPRINT(("BC shift for wide char %lc is %d\n", fg->wpattern[i], \ + DPRINT(("BC shift for wide char " CHF " is %d\n", fg->wpattern[i],\ k)); \ if (fg->icase) \ { \ @@ -308,7 +308,7 @@ static int fastcmp(const void *, const b r = hashtable_put(fg->qsBc_table, &wc, &k); \ if ((r == HASH_FAIL) || (r == HASH_FULL)) \ FAIL_COMP(REG_ESPACE); \ - DPRINT(("BC shift for wide char %lc is %d\n", wc, k)); \ + DPRINT(("BC shift for wide char " CHF " is %d\n", wc, k)); \ } \ } @@ -329,7 +329,7 @@ static int fastcmp(const void *, const b r = hashtable_put(fg->qsBc_table, &fg->wpattern[i], &k); \ if ((r == HASH_FAIL) || (r == HASH_FULL)) \ FAIL_COMP(REG_ESPACE); \ - DPRINT(("Reverse BC shift for wide char %lc is %d\n", \ + DPRINT(("Reverse BC shift for wide char " CHF " is %d\n", \ fg->wpattern[i], k)); \ if (fg->icase) \ { \ @@ -338,7 +338,8 @@ static int fastcmp(const void *, const b r = hashtable_put(fg->qsBc_table, &wc, &k); \ if ((r == HASH_FAIL) || (r == HASH_FULL)) \ FAIL_COMP(REG_ESPACE); \ - DPRINT(("Reverse BC shift for wide char %lc is %d\n", wc, k));\ + DPRINT(("Reverse BC shift for wide char " CHF " is %d\n", wc, \ + k)); \ } \ } Modified: user/gabor/tre-integration/contrib/tre/lib/tre-internal.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Sat Sep 17 04:31:43 2011 (r225633) +++ user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Sat Sep 17 05:35:59 2011 (r225634) @@ -146,8 +146,10 @@ typedef enum { STR_WIDE, STR_BYTE, STR_M /* Define STRF to the correct printf formatter for strings. */ #ifdef TRE_WCHAR #define STRF "ls" +#define CHF "lc" #else /* !TRE_WCHAR */ #define STRF "s" +#define CHF "c" #endif /* !TRE_WCHAR */ /* TNFA transition type. A TNFA state is an array of transitions,