From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 85F77207BD for ; Thu, 20 Apr 2017 21:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032043AbdDTVZP (ORCPT ); Thu, 20 Apr 2017 17:25:15 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36608 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031383AbdDTVZI (ORCPT ); Thu, 20 Apr 2017 17:25:08 -0400 Received: by mail-wm0-f67.google.com with SMTP id u65so967687wmu.3 for ; Thu, 20 Apr 2017 14:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AEoy4ea/mZckysMmjb2YQ9mB+jaZMrIYR77VOXnA9Zo=; b=V9tviaYiqvNJj5caBC7QWY/nDVW27exyV+0x+xDdgjsSeamUrHVD28szmYE/Iwwwl2 qI1N7AJwxM0+SDFQfsUV/NgwmktWYfM7H1VldfccC/4UTpLcJ4oP4yDpbqdGAerDHcg8 GcwyEnKOCxhV21kbLNTioVGxORsLugPqAAIUSbHlIStjahotTNwGeT8m6wsNEGM1629S B151NejFP62a2sGTxARRyqhZffWpbOnE6YMxR80pdDVG+DWspuWg9B9rsIucAFiX5+lg SR9NZOgxTa0QxmkEY4bgPp6CmSTCj6rSbZ8NNy2Nb0TCYaK3TG0rHhEdcyxNcTjSHZKH Yp6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEoy4ea/mZckysMmjb2YQ9mB+jaZMrIYR77VOXnA9Zo=; b=YvexAgV4On6JxefwlQ/BzFQ+z8x+yWzt0RbLqjao86DnFLgd3Dwk4igwDkclOPeLVC DFiprihIsvMJuF4RwXlAn0LgeYmOHcLmhtwlXw25Onn4+VwXYn/LMT3TnjHn0ascPFQe vZcPp6ZMRiqmrDN1Q+pDTxe3vCQDxWA5E5xpwP/E99HVdw9juBR82pV0A8WKnKm1YtsE ThXLzmFw1K+RI8JF1BgtxtlS7pK83b5l0drhDirZqGWBMyanx6tRq/J9a6W/BJqCfIv/ OKQIp6kaN4kpMUCMB5306KSBvod3o9bW5O420xV6RtKulfiUejKT3rmrJYd4MSJ6RtbV Tk2Q== X-Gm-Message-State: AN3rC/6MGNZh5vj3lP3bvaVcyTJ6epaIz13ANTB24njaxFuuImS2uRQ4 4MMuPCK0PMloaA== X-Received: by 10.28.166.21 with SMTP id p21mr4909294wme.135.1492723496871; Thu, 20 Apr 2017 14:24:56 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id k63sm442322wmf.9.2017.04.20.14.24.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 14:24:55 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Jeffrey Walton , =?UTF-8?q?Micha=C5=82=20Kiedrowicz?= , J Smith , Victor Leschuk , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Fredrik Kuivinen , =?UTF-8?q?Zolt=C3=A1n=20Herczeg?= , Brandon Williams , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 13/18] grep: change the internal PCRE code & header names to be PCRE1 Date: Thu, 20 Apr 2017 21:23:40 +0000 Message-Id: <20170420212345.7408-14-avarab@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170420212345.7408-1-avarab@gmail.com> References: <20170420212345.7408-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the internal PCRE variable & function names to have a "1" suffix. This is for preparation for libpcre2 support, where having non-versioned names would be confusing. The earlier "grep: change the internal PCRE macro names to be PCRE1" change elaborates on the motivations behind this commit. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/grep.c | 4 ++-- grep.c | 56 ++++++++++++++++++++++++++++---------------------------- grep.h | 10 +++++----- revision.c | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index be3dbd6957..28e0dd3236 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -490,7 +490,7 @@ static void compile_submodule_options(const struct grep_opt *opt, case GREP_PATTERN_TYPE_FIXED: argv_array_push(&submodule_options, "-F"); break; - case GREP_PATTERN_TYPE_PCRE: + case GREP_PATTERN_TYPE_PCRE1: argv_array_push(&submodule_options, "-P"); break; case GREP_PATTERN_TYPE_UNSPECIFIED: @@ -1022,7 +1022,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) GREP_PATTERN_TYPE_FIXED), OPT_SET_INT('P', "perl-regexp", &pattern_type_arg, N_("use Perl-compatible regular expressions"), - GREP_PATTERN_TYPE_PCRE), + GREP_PATTERN_TYPE_PCRE1), OPT_GROUP(""), OPT_BOOL('n', "line-number", &opt.linenum, N_("show line numbers")), OPT_NEGBIT('h', NULL, &opt.pathname, N_("don't show filenames"), 1), diff --git a/grep.c b/grep.c index 2535abd214..d2c87ee2c3 100644 --- a/grep.c +++ b/grep.c @@ -63,7 +63,7 @@ static int parse_pattern_type_arg(const char *opt, const char *arg) else if (!strcmp(arg, "perl") || !strcmp(arg, "pcre") || !strcmp(arg, "pcre1")) - return GREP_PATTERN_TYPE_PCRE; + return GREP_PATTERN_TYPE_PCRE1; die("bad %s argument: %s", opt, arg); } @@ -180,25 +180,25 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st case GREP_PATTERN_TYPE_BRE: opt->fixed = 0; - opt->pcre = 0; + opt->pcre1 = 0; opt->regflags &= ~REG_EXTENDED; break; case GREP_PATTERN_TYPE_ERE: opt->fixed = 0; - opt->pcre = 0; + opt->pcre1 = 0; opt->regflags |= REG_EXTENDED; break; case GREP_PATTERN_TYPE_FIXED: opt->fixed = 1; - opt->pcre = 0; + opt->pcre1 = 0; opt->regflags &= ~REG_EXTENDED; break; - case GREP_PATTERN_TYPE_PCRE: + case GREP_PATTERN_TYPE_PCRE1: opt->fixed = 0; - opt->pcre = 1; + opt->pcre1 = 1; break; } } @@ -326,7 +326,7 @@ static NORETURN void compile_regexp_failed(const struct grep_pat *p, } #ifdef USE_LIBPCRE1 -static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt) +static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) { const char *error; int erroffset; @@ -334,23 +334,23 @@ static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt) if (opt->ignore_case) { if (has_non_ascii(p->pattern)) - p->pcre_tables = pcre_maketables(); + p->pcre1_tables = pcre_maketables(); options |= PCRE_CASELESS; } if (is_utf8_locale() && has_non_ascii(p->pattern)) options |= PCRE_UTF8; - p->pcre_regexp = pcre_compile(p->pattern, options, &error, &erroffset, - p->pcre_tables); - if (!p->pcre_regexp) + p->pcre1_regexp = pcre_compile(p->pattern, options, &error, &erroffset, + p->pcre1_tables); + if (!p->pcre1_regexp) compile_regexp_failed(p, error); - p->pcre_extra_info = pcre_study(p->pcre_regexp, 0, &error); - if (!p->pcre_extra_info && error) + p->pcre1_extra_info = pcre_study(p->pcre1_regexp, 0, &error); + if (!p->pcre1_extra_info && error) die("%s", error); } -static int pcrematch(struct grep_pat *p, const char *line, const char *eol, +static int pcre1match(struct grep_pat *p, const char *line, const char *eol, regmatch_t *match, int eflags) { int ovector[30], ret, flags = 0; @@ -358,7 +358,7 @@ static int pcrematch(struct grep_pat *p, const char *line, const char *eol, if (eflags & REG_NOTBOL) flags |= PCRE_NOTBOL; - ret = pcre_exec(p->pcre_regexp, p->pcre_extra_info, line, eol - line, + ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line, eol - line, 0, flags, ovector, ARRAY_SIZE(ovector)); if (ret < 0 && ret != PCRE_ERROR_NOMATCH) die("pcre_exec failed with error code %d", ret); @@ -371,25 +371,25 @@ static int pcrematch(struct grep_pat *p, const char *line, const char *eol, return ret; } -static void free_pcre_regexp(struct grep_pat *p) +static void free_pcre1_regexp(struct grep_pat *p) { - pcre_free(p->pcre_regexp); - pcre_free(p->pcre_extra_info); - pcre_free((void *)p->pcre_tables); + pcre_free(p->pcre1_regexp); + pcre_free(p->pcre1_extra_info); + pcre_free((void *)p->pcre1_tables); } #else /* !USE_LIBPCRE1 */ -static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt) +static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) { die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE"); } -static int pcrematch(struct grep_pat *p, const char *line, const char *eol, +static int pcre1match(struct grep_pat *p, const char *line, const char *eol, regmatch_t *match, int eflags) { return 1; } -static void free_pcre_regexp(struct grep_pat *p) +static void free_pcre1_regexp(struct grep_pat *p) { } #endif /* !USE_LIBPCRE1 */ @@ -476,8 +476,8 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt) return; } - if (opt->pcre) { - compile_pcre_regexp(p, opt); + if (opt->pcre1) { + compile_pcre1_regexp(p, opt); return; } @@ -833,8 +833,8 @@ void free_grep_patterns(struct grep_opt *opt) case GREP_PATTERN_BODY: if (p->kws) kwsfree(p->kws); - else if (p->pcre_regexp) - free_pcre_regexp(p); + else if (p->pcre1_regexp) + free_pcre1_regexp(p); else regfree(&p->regexp); free(p->pattern); @@ -913,8 +913,8 @@ static int patmatch(struct grep_pat *p, char *line, char *eol, if (p->fixed) hit = !fixmatch(p, line, eol, match); - else if (p->pcre_regexp) - hit = !pcrematch(p, line, eol, match, eflags); + else if (p->pcre1_regexp) + hit = !pcre1match(p, line, eol, match, eflags); else hit = !regexec_buf(&p->regexp, line, eol - line, 1, match, eflags); diff --git a/grep.h b/grep.h index 073b0e4c92..fa2ab9485f 100644 --- a/grep.h +++ b/grep.h @@ -46,9 +46,9 @@ struct grep_pat { size_t patternlen; enum grep_header_field field; regex_t regexp; - pcre *pcre_regexp; - pcre_extra *pcre_extra_info; - const unsigned char *pcre_tables; + pcre *pcre1_regexp; + pcre_extra *pcre1_extra_info; + const unsigned char *pcre1_tables; kwset_t kws; unsigned fixed:1; unsigned ignore_case:1; @@ -68,7 +68,7 @@ enum grep_pattern_type { GREP_PATTERN_TYPE_BRE, GREP_PATTERN_TYPE_ERE, GREP_PATTERN_TYPE_FIXED, - GREP_PATTERN_TYPE_PCRE + GREP_PATTERN_TYPE_PCRE1 }; struct grep_expr { @@ -111,7 +111,7 @@ struct grep_opt { int allow_textconv; int extended; int use_reflog_filter; - int pcre; + int pcre1; int relative; int pathname; int null_following_name; diff --git a/revision.c b/revision.c index 03a3a012de..7a10a8570a 100644 --- a/revision.c +++ b/revision.c @@ -1996,7 +1996,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) { revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED; } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) { - revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE; + revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE1; } else if (!strcmp(arg, "--all-match")) { revs->grep_filter.all_match = 1; } else if (!strcmp(arg, "--invert-grep")) { -- 2.11.0