From 37c054af09357276eb560990eba1f20cdc489bfc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 17 Oct 2015 19:18:01 -0700 Subject: [PATCH 3/3] maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp * top/maint.mk (_gl_TS_function_match): This heuristic extern-function- name-extraction regexp mistakenly used \S+, and would mistakenly extract "*F" from "extern int *F()" rather than the desired "F". Use \w+ instead. --- ChangeLog | 8 ++++++++ top/maint.mk | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7dafb8b..81f8cd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2015-10-17 Jim Meyering + maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp + * top/maint.mk (_gl_TS_function_match): This heuristic extern-function- + name-extraction regexp mistakenly used \S+, and would mistakenly + extract "*F" from "extern int *F()" rather than the desired "F". + Use \w+ instead. + +2015-10-17 Jim Meyering + maint.mk: sc_tight_scope: factor and support OS X * top/maint.mk (_gl_tight_scope): Address three issues: - factor out four instances of code that wraps a string in "^...$" diff --git a/top/maint.mk b/top/maint.mk index 6fb6d84..4887e5d 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1600,7 +1600,7 @@ ifeq (a,b) # do not need to be marked. Symbols matching '__.*' are # reserved by the compiler, so are automatically excluded below. _gl_TS_unmarked_extern_functions ?= main usage -_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\S+) *\(/ +_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\w+) *\(/ # If your project uses a macro like "XTERN", then put # the following in cfg.mk to override this default: -- 2.6.0